From 07421cb9bb3e1b52489aa91c705808b0200b6265 Mon Sep 17 00:00:00 2001 From: Robert Carr Date: Mon, 20 Jun 2016 15:48:42 -0700 Subject: 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 --- core/java/android/widget/PopupWindow.java | 4 ---- 1 file changed, 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. -- cgit v1.2.3-59-g8ed1b