diff options
| author | Adam Powell <adamp@google.com> | 2011-05-20 15:59:19 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-20 15:59:19 -0700 |
| commit | bdc26dc34a5d848883d5acdee62f5b4403e8fe04 (patch) | |
| tree | 55a5e12075688e927d3f05aebd0e4b9ca6b8adf2 /core/java | |
| parent | 1b144e625fb0d34cd680c44cbcfb2deb8a76d4c6 (diff) | |
| parent | 3f4a764cf400aa209c1f8f76a1c73143eefc4905 (diff) | |
| download | frameworks_base-bdc26dc34a5d848883d5acdee62f5b4403e8fe04.zip frameworks_base-bdc26dc34a5d848883d5acdee62f5b4403e8fe04.tar.gz frameworks_base-bdc26dc34a5d848883d5acdee62f5b4403e8fe04.tar.bz2 | |
Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/widget/PopupWindow.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/widget/PopupWindow.java b/core/java/android/widget/PopupWindow.java index 72b70bc..4fcd7a9 100644 --- a/core/java/android/widget/PopupWindow.java +++ b/core/java/android/widget/PopupWindow.java @@ -1169,8 +1169,7 @@ public class PopupWindow { int bottomEdge = displayFrame.bottom; if (ignoreBottomDecorations) { Resources res = anchor.getContext().getResources(); - bottomEdge = res.getDisplayMetrics().heightPixels - - (int) res.getDimension(com.android.internal.R.dimen.screen_margin_bottom); + bottomEdge = res.getDisplayMetrics().heightPixels; } final int distanceToBottom = bottomEdge - (anchorPos[1] + anchor.getHeight()) - yOffset; final int distanceToTop = anchorPos[1] - displayFrame.top + yOffset; |