commit ad61ce0767fe85d62b8c94001520bd4fd28f6a98
author Sunny Goyal <sunnygoyal@google.com> Wed Aug 08 12:39:13 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 08 12:39:13 2018 -0700
tree f92dd12124e6ba9857d581f3e70c331909d6a4a5
parent acaffe609cb75a70426a7eabca83b6fc9538c132
parent c73828fd96acc71fb7decbfbd392dada4a7cfeb1

Merge "Fix overlapping FloatingViewType IntDef"
am: c73828fd96

Change-Id: I2b5f60a83ed1f07050f95f4c4240682f7ec480f6

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