diff options
| author | Tobias Dubois <tobias.dubois@sony.com> | 2018-06-11 16:25:55 +0200 |
|---|---|---|
| committer | Edward Savage-Jones <edward.savage-jones@sony.com> | 2018-08-08 13:47:28 +0200 |
| commit | 1e63367b942ab675b3bc92b8f6a7cba62166b54d (patch) | |
| tree | f92dd12124e6ba9857d581f3e70c331909d6a4a5 /src/com | |
| parent | 90a54e7375526395ef5d64783682b692d5242243 (diff) | |
| download | Launcher3-1e63367b942ab675b3bc92b8f6a7cba62166b54d.tar.gz | |
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')
| -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 daf20323d0..b614ec9d6b 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 |