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

* commit 'ea26da244efe4757ec01fc30980d6f1c5047bffa':
  Specifies the new height/width for update() on ListPopupWindow.show().
This commit is contained in:
Jun Mukai
2015-06-10 23:16:16 +00:00
committed by Android Git Automerger

View File

@@ -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) {