diff options
| author | Tobias Dubois <tobias.dubois@sony.com> | 2018-06-11 16:25:55 +0200 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2018-08-08 10:19:52 -0700 |
| commit | 7b5834d9b1f09d42cea4d8f052e18ce87fea8187 (patch) | |
| tree | f9aa012d03feceb94de552f267972dd1b748bebd /src | |
| parent | 6e1f150c824203b0f6d688da534b5389103bc743 (diff) | |
| download | android_packages_apps_Trebuchet-7b5834d9b1f09d42cea4d8f052e18ce87fea8187.tar.gz android_packages_apps_Trebuchet-7b5834d9b1f09d42cea4d8f052e18ce87fea8187.tar.bz2 android_packages_apps_Trebuchet-7b5834d9b1f09d42cea4d8f052e18ce87fea8187.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')
| -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 |