diff options
| author | Adam Powell <adamp@google.com> | 2011-05-23 17:18:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-23 17:18:54 -0700 |
| commit | 7d372b49e2691967fab3a9d63103bab1b1ff205e (patch) | |
| tree | 77550c495c04ecc21de15ff474561d83ed0b11fd /core/java/android/widget/PopupWindow.java | |
| parent | ed5af6d93b2758b86175b13c380fcd164e537a7c (diff) | |
| parent | 7dfdb914206eafbf2aa4533e9b6a50428a5d0d3d (diff) | |
am 7dfdb914: am f483ed90: am bdc26dc3: Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2
* commit '7dfdb914206eafbf2aa4533e9b6a50428a5d0d3d':
Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations.
Diffstat (limited to 'core/java/android/widget/PopupWindow.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 1e1a0431e1bb..563fc26aa6e5 100644 --- a/core/java/android/widget/PopupWindow.java +++ b/core/java/android/widget/PopupWindow.java @@ -1171,8 +1171,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; |