diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-02-19 20:24:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-02-19 20:24:21 +0000 |
| commit | 06ed106de2dd7b66fdf3633fd7fc1641fc9e8661 (patch) | |
| tree | 5d2b2328afe5e9609162d4bbf918705a31b953be /src | |
| parent | 201840ba234521b414a944733174a49c2fa3b53f (diff) | |
| parent | 462551be9c45d7ac57e0b40dcde995f65c3cdfc2 (diff) | |
| download | android_packages_apps_Trebuchet-06ed106de2dd7b66fdf3633fd7fc1641fc9e8661.tar.gz android_packages_apps_Trebuchet-06ed106de2dd7b66fdf3633fd7fc1641fc9e8661.tar.bz2 android_packages_apps_Trebuchet-06ed106de2dd7b66fdf3633fd7fc1641fc9e8661.zip | |
Merge "Some live tile and state fixes" into ub-launcher3-master
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/AbstractFloatingView.java | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java index e75527e34..599a3533d 100644 --- a/src/com/android/launcher3/AbstractFloatingView.java +++ b/src/com/android/launcher3/AbstractFloatingView.java @@ -55,7 +55,6 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch TYPE_DISCOVERY_BOUNCE, TYPE_SNACKBAR, - TYPE_QUICKSTEP_PREVIEW, TYPE_TASK_MENU, TYPE_OPTIONS_POPUP }) @@ -71,25 +70,23 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch public static final int TYPE_SNACKBAR = 1 << 7; // Popups related to quickstep UI - public static final int TYPE_QUICKSTEP_PREVIEW = 1 << 8; - public static final int TYPE_TASK_MENU = 1 << 9; - public static final int TYPE_OPTIONS_POPUP = 1 << 10; + 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 - | TYPE_QUICKSTEP_PREVIEW | TYPE_ON_BOARD_POPUP | TYPE_DISCOVERY_BOUNCE | TYPE_TASK_MENU + | TYPE_ON_BOARD_POPUP | TYPE_DISCOVERY_BOUNCE | TYPE_TASK_MENU | TYPE_OPTIONS_POPUP | TYPE_SNACKBAR; // Type of popups which should be kept open during launcher rebind public static final int TYPE_REBIND_SAFE = TYPE_WIDGETS_FULL_SHEET - | TYPE_QUICKSTEP_PREVIEW | TYPE_ON_BOARD_POPUP | TYPE_DISCOVERY_BOUNCE; + | TYPE_ON_BOARD_POPUP | TYPE_DISCOVERY_BOUNCE; // Usually we show the back button when a floating view is open. Instead, hide for these types. public static final int TYPE_HIDE_BACK_BUTTON = TYPE_ON_BOARD_POPUP | TYPE_DISCOVERY_BOUNCE | TYPE_SNACKBAR; - public static final int TYPE_ACCESSIBLE = TYPE_ALL - & ~TYPE_DISCOVERY_BOUNCE & ~TYPE_QUICKSTEP_PREVIEW; + public static final int TYPE_ACCESSIBLE = TYPE_ALL & ~TYPE_DISCOVERY_BOUNCE; // These view all have particular operation associated with swipe down interaction. public static final int TYPE_STATUS_BAR_SWIPE_DOWN_DISALLOW = TYPE_WIDGETS_BOTTOM_SHEET | |