commit bc742b6a4fbbcb523a8d0504171b9c2c51fecf90
author Sunny Goyal <sunnygoyal@google.com> Wed Aug 08 12:43:18 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 08 12:43:18 2018 -0700
tree 286af4f39447ab08a44b4a07cdef22358e01a85a
parent 444b52a18fbc84992ca6c56569e996fd4ecba1d7
parent ad61ce0767fe85d62b8c94001520bd4fd28f6a98

Merge "Fix overlapping FloatingViewType IntDef" am: c73828fd96
am: ad61ce0767

Change-Id: Id87a75c690131e1c2e2ac48f5a07dd89fb6976ca

src/com/android/launcher3/AbstractFloatingView.java

diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java
index daf2032..b614ec9 100644
--- a/src/com/android/launcher3/AbstractFloatingView.java
+++ b/src/com/android/launcher3/AbstractFloatingView.java
@@ -68,9 +68,9 @@
     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