diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2018-08-08 19:24:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-08-08 19:24:54 +0000 |
| commit | 107dcf8d0a45f03dc786f16f49b36c7a9dad8c21 (patch) | |
| tree | e51d1d01c994dc9e2548c3506183a4b0502d4e98 /src | |
| parent | aad3359e8eb3e5d28954f88bda8147bcb1d74236 (diff) | |
| parent | 7b5834d9b1f09d42cea4d8f052e18ce87fea8187 (diff) | |
| download | android_packages_apps_Trebuchet-107dcf8d0a45f03dc786f16f49b36c7a9dad8c21.tar.gz android_packages_apps_Trebuchet-107dcf8d0a45f03dc786f16f49b36c7a9dad8c21.tar.bz2 android_packages_apps_Trebuchet-107dcf8d0a45f03dc786f16f49b36c7a9dad8c21.zip | |
Merge "Fix overlapping FloatingViewType IntDef" into ub-launcher3-master
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/AbstractFloatingView.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java index 322383778..e58e73d28 100644 --- a/src/com/android/launcher3/AbstractFloatingView.java +++ b/src/com/android/launcher3/AbstractFloatingView.java @@ -69,9 +69,9 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch public static final int TYPE_DISCOVERY_BOUNCE = 1 << 6; // Popups related to quickstep UI - public static final int TYPE_QUICKSTEP_PREVIEW = 1 << 6; - public static final int TYPE_TASK_MENU = 1 << 7; - public static final int TYPE_OPTIONS_POPUP = 1 << 8; + public static final int TYPE_QUICKSTEP_PREVIEW = 1 << 7; + public static final int TYPE_TASK_MENU = 1 << 8; + public static final int TYPE_OPTIONS_POPUP = 1 << 9; public static final int TYPE_ALL = TYPE_FOLDER | TYPE_ACTION_POPUP | TYPE_WIDGETS_BOTTOM_SHEET | TYPE_WIDGET_RESIZE_FRAME | TYPE_WIDGETS_FULL_SHEET |