diff options
| author | 2016-04-13 18:54:59 +0000 | |
|---|---|---|
| committer | 2016-04-13 18:55:00 +0000 | |
| commit | caa747b9ac0076f52d01f0c3929cb8e56ff6d3b9 (patch) | |
| tree | 9470f2b15d14fdf836c88ec88a359e54bd99d57e | |
| parent | 3c5870912b6dc20e13c3af5e078a600b88904e99 (diff) | |
| parent | b8320f7c58b46fea23e2827c82b46783b8c71b63 (diff) | |
Merge "Correct PopupWindow spaceAbove calculation." into nyc-dev
| -rw-r--r-- | core/java/android/widget/PopupWindow.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/PopupWindow.java b/core/java/android/widget/PopupWindow.java index 12f2e20151ee..af4675609079 100644 --- a/core/java/android/widget/PopupWindow.java +++ b/core/java/android/widget/PopupWindow.java @@ -1579,7 +1579,7 @@ public class PopupWindow { return true; } - final int spaceAbove = displayFrameTop + anchorTopInScreen - anchorHeight; + final int spaceAbove = anchorTopInScreen - anchorHeight - displayFrameTop; if (height <= spaceAbove) { // Move everything up. if (mOverlapAnchor) { |