diff options
| author | Adam Powell <adamp@google.com> | 2011-08-07 16:41:39 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-07 16:41:39 -0700 |
| commit | 30a6e38762769bc3e230c40520c1ac6a594188a0 (patch) | |
| tree | cf5145cb1cedfff79346c82849851a6b2b753ac0 /core | |
| parent | 72aa694f3c22ba4d38caad119df0005d55d1fc23 (diff) | |
| parent | a7845ed44a3722e7d96ca9b677be213da7e8c8fe (diff) | |
| download | frameworks_base-30a6e38762769bc3e230c40520c1ac6a594188a0.zip frameworks_base-30a6e38762769bc3e230c40520c1ac6a594188a0.tar.gz frameworks_base-30a6e38762769bc3e230c40520c1ac6a594188a0.tar.bz2 | |
Merge "Fix bug 5124712 - allow partial items when measuring height of list popups"
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/widget/ListPopupWindow.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/ListPopupWindow.java b/core/java/android/widget/ListPopupWindow.java index f057d07..307959b 100644 --- a/core/java/android/widget/ListPopupWindow.java +++ b/core/java/android/widget/ListPopupWindow.java @@ -1092,7 +1092,7 @@ public class ListPopupWindow { } final int listContent = mDropDownList.measureHeightOfChildren(MeasureSpec.UNSPECIFIED, - 0, ListView.NO_POSITION, maxHeight - otherHeights, 2); + 0, ListView.NO_POSITION, maxHeight - otherHeights, -1); // add padding only if the list has items in it, that way we don't show // the popup if it is not needed if (listContent > 0) otherHeights += padding; |