diff options
| author | Robert Carr <racarr@google.com> | 2016-06-20 15:48:42 -0700 |
|---|---|---|
| committer | Robert Carr <racarr@google.com> | 2016-06-20 15:55:02 -0700 |
| commit | 07421cb9bb3e1b52489aa91c705808b0200b6265 (patch) | |
| tree | 17e4069f9ad644b8e47b0e420466743cc47a2c6c /core/java/android | |
| parent | f6e3c9a5537a5e1e7ef7be956d8a335106afd8f7 (diff) | |
Don't try and resolve WRAP_CONTENT too early.
At the point of showDropDownPosition measure
may have not yet been called and we can't try
and resolve WRAP_CONTENT. ViewRoot will do it for us
and set requestedWidth/Height at an appropriate point.
Bug: 29496188
Change-Id: I99f26612bec800f3e321495b3df3e37b5ffb3152
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/widget/PopupWindow.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/core/java/android/widget/PopupWindow.java b/core/java/android/widget/PopupWindow.java index 3f6e625245f3..19aa1a869a5e 100644 --- a/core/java/android/widget/PopupWindow.java +++ b/core/java/android/widget/PopupWindow.java @@ -1517,13 +1517,9 @@ public class PopupWindow { anchor.getWindowVisibleDisplayFrame(displayFrame); if (width == MATCH_PARENT) { width = displayFrame.right - displayFrame.left; - } else if (width == WRAP_CONTENT) { - width = mContentView.getMeasuredWidth(); } if (height == MATCH_PARENT) { height = displayFrame.bottom - displayFrame.top; - } else if (height == WRAP_CONTENT) { - height = mContentView.getMeasuredHeight(); } // Let the window manager know to align the top to y. |