Merge "Specifies the new height/width for update() on ListPopupWindow.show()." into mnc-dev

2015-06-10 21:13:26 +00:00
parent 5ac4a5fa38 0eaec1f5d1
commit b3aa575e3b
1 changed files with 2 additions and 3 deletions
--- a/core/java/android/widget/ListPopupWindow.java
+++ b/core/java/android/widget/ListPopupWindow.java
@@ -618,12 +618,11 @@ public class ListPopupWindow {
                heightSpec = mDropDownHeight;
            }

-            mPopup.setWidth(widthSpec);
-            mPopup.setHeight(heightSpec);
            mPopup.setOutsideTouchable(!mForceIgnoreOutsideTouch && !mDropDownAlwaysVisible);

            mPopup.update(getAnchorView(), mDropDownHorizontalOffset,
-                            mDropDownVerticalOffset, -1, -1);
+                            mDropDownVerticalOffset, (widthSpec < 0)? -1 : widthSpec,
+                            (heightSpec < 0)? -1 : heightSpec);
        } else {
            final int widthSpec;
            if (mDropDownWidth == ViewGroup.LayoutParams.MATCH_PARENT) {