diff options
| author | Tobias Dubois <tobias.dubois@sony.com> | 2018-06-11 16:25:55 +0200 |
|---|---|---|
| committer | Kevin F. Haggerty <haggertk@lineageos.org> | 2018-11-01 22:01:43 -0600 |
| commit | 5762c24146e4465b1790ab87a7b082530fe171df (patch) | |
| tree | 0a41d938cc127b1d219f2274717423eae4e73f3a /src/com/android/launcher3 | |
| parent | dcfa3cd94cbcc4d3977025f58c86d08c3bf2de63 (diff) | |
| download | android_packages_apps_Trebuchet-5762c24146e4465b1790ab87a7b082530fe171df.tar.gz android_packages_apps_Trebuchet-5762c24146e4465b1790ab87a7b082530fe171df.tar.bz2 android_packages_apps_Trebuchet-5762c24146e4465b1790ab87a7b082530fe171df.zip | |
Fix overlapping FloatingViewType IntDef
TYPE_DISCOVERY_BOUNCE and TYPE_QUICKSTEP_PREVIEW have the same value.
Make sure each flag has a unique value.
Test: manual
Change-Id: I0fec3f27ffc31bad80d3af7b3baa3631b61b2567
Diffstat (limited to 'src/com/android/launcher3')
| -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 daf20323d..b614ec9d6 100644 --- a/src/com/android/launcher3/AbstractFloatingView.java +++ b/src/com/android/launcher3/AbstractFloatingView.java @@ -68,9 +68,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 |