Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Constrain ListPopupWindow hint width spec to >= 0" into mnc-dev

Browse Source
This commit is contained in:
Alan Viverette
2015-06-25 20:00:54 +00:00
committed by Android (Google) Code Review
parent fdf102e62d ba4332d9cf
commit e71c6e3832
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/android/widget/ListPopupWindow.java
View File

@@ -1127,10 +1127,19 @@ public class ListPopupWindow {
break;
}
// measure the hint's height to find how much more vertical space
// we need to add to the drop down's height
int widthSpec = MeasureSpec.makeMeasureSpec(mDropDownWidth, MeasureSpec.AT_MOST);
int heightSpec = MeasureSpec.UNSPECIFIED;
// Measure the hint's height to find how much more vertical
// space we need to add to the drop down's height.
final int widthSize;
final int widthMode;
if (mDropDownWidth >= 0) {
widthMode = MeasureSpec.AT_MOST;
widthSize = mDropDownWidth;
} else {
widthMode = MeasureSpec.UNSPECIFIED;
widthSize = 0;
}
final int widthSpec = MeasureSpec.makeMeasureSpec(widthSize, widthMode);
final int heightSpec = MeasureSpec.UNSPECIFIED;
hintView.measure(widthSpec, heightSpec);
hintParams = (LinearLayout.LayoutParams) hintView.getLayoutParams();