summaryrefslogtreecommitdiff
path: root/core/java/android/widget/PopupWindow.java
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2016-06-30 17:51:01 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-30 17:51:01 +0000
commitb7c60cb24f1a8aa09d6c645d2326f44ad5186e97 (patch)
tree6fe99d64ae579e7ab13a21a4735c52bd5f9ef305 /core/java/android/widget/PopupWindow.java
parentd1441edee0fddfdba21dcfcacb7ff76daa8c18d1 (diff)
parentbb3fc63947a98c9005cbd189a5f80957b3960b2f (diff)
Merge \\\"Only clip PopupWindow in the vertical direction\\\" into nyc-dev am: 4b736ea56d am: a2beb44834
am: bb3fc63947 Change-Id: I1ae838346c9125d08987dee62171619d6c96e96b
Diffstat (limited to 'core/java/android/widget/PopupWindow.java')
-rw-r--r--core/java/android/widget/PopupWindow.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/PopupWindow.java b/core/java/android/widget/PopupWindow.java
index 404c1186db35..b7f57cb41f0e 100644
--- 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;
}