summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2016-06-30 17:35:52 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-30 17:35:52 +0000
commita2beb44834f8847a6532987e9941a9afcd812129 (patch)
treea42fb27e2eea6c7a7200f8c00628933f9d71dc65 /core/java/android
parent650cc68f10f7138d4e048dbd7b08162241388f8f (diff)
parent4b736ea56d5301381838c80b2333a05df1eb499e (diff)
Merge \"Only clip PopupWindow in the vertical direction\" into nyc-dev
am: 4b736ea56d Change-Id: Idf5aedfb2f19595b8317c7dca1640ff0caf31696
Diffstat (limited to 'core/java/android')
-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 6477f079cb7f..6432f703f2ba 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;
}