Merge \"Only clip PopupWindow in the vertical direction\" into nyc-dev

am: 4b736ea56d Change-Id: Ic10c4641d90f06b52d34285e42c35ae744f823eb
2016-06-30 17:36:00 +00:00
parent 176f9cb656 4b736ea56d
commit bf91103763
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/widget/PopupWindow.java
+++ b/core/java/android/widget/PopupWindow.java
@@ -1396,7 +1396,7 @@ public class PopupWindow {
    private int computeGravity() {
        int gravity = Gravity.START | Gravity.TOP;
        if (mClipToScreen || mClippingEnabled) {
-            gravity |= Gravity.DISPLAY_CLIP_VERTICAL | Gravity.DISPLAY_CLIP_HORIZONTAL;
+            gravity |= Gravity.DISPLAY_CLIP_VERTICAL;
        }
        return gravity;
    }