diff options
| author | 2025-01-13 09:51:15 -0800 | |
|---|---|---|
| committer | 2025-01-15 15:23:17 -0800 | |
| commit | aacbfce7d1496bc79935833071a28053b8157c5a (patch) | |
| tree | 7532687b5b8e650f1b55df2c901409adfa2cf876 | |
| parent | bc3995222bf01123afc6ae527f4f77abf13f7295 (diff) | |
launcher3: Add one grid edu to floating view.
Test: manual, existing
Flag: com.android.launcher3.one_grid_specs
Bug: 388311172
Change-Id: I0ea819d266af443d71ed22f5394b41a51202fa0b
| -rw-r--r-- | src/com/android/launcher3/AbstractFloatingView.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java index 76c0f90e74..4e44324678 100644 --- a/src/com/android/launcher3/AbstractFloatingView.java +++ b/src/com/android/launcher3/AbstractFloatingView.java @@ -75,7 +75,8 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch TYPE_ADD_TO_HOME_CONFIRMATION, TYPE_TASKBAR_OVERLAY_PROXY, TYPE_TASKBAR_PINNING_POPUP, - TYPE_PIN_IME_POPUP + TYPE_PIN_IME_POPUP, + TYPE_ONE_GRID_MIGRATION_EDU, }) @Retention(RetentionPolicy.SOURCE) public @interface FloatingViewType {} @@ -104,6 +105,7 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch public static final int TYPE_TASKBAR_OVERLAY_PROXY = 1 << 20; public static final int TYPE_TASKBAR_PINNING_POPUP = 1 << 21; public static final int TYPE_PIN_IME_POPUP = 1 << 22; + public static final int TYPE_ONE_GRID_MIGRATION_EDU = 1 << 23; public static final int TYPE_ALL = TYPE_FOLDER | TYPE_ACTION_POPUP | TYPE_WIDGETS_BOTTOM_SHEET | TYPE_WIDGET_RESIZE_FRAME | TYPE_WIDGETS_FULL_SHEET @@ -112,19 +114,19 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch | TYPE_ICON_SURFACE | TYPE_DRAG_DROP_POPUP | TYPE_PIN_WIDGET_FROM_EXTERNAL_POPUP | TYPE_TASKBAR_EDUCATION_DIALOG | TYPE_TASKBAR_ALL_APPS | TYPE_OPTIONS_POPUP_DIALOG | TYPE_ADD_TO_HOME_CONFIRMATION | TYPE_TASKBAR_OVERLAY_PROXY - | TYPE_TASKBAR_PINNING_POPUP | TYPE_PIN_IME_POPUP; + | TYPE_TASKBAR_PINNING_POPUP | TYPE_PIN_IME_POPUP | TYPE_ONE_GRID_MIGRATION_EDU; // Type of popups which should be kept open during launcher rebind public static final int TYPE_REBIND_SAFE = TYPE_WIDGETS_FULL_SHEET | TYPE_WIDGETS_BOTTOM_SHEET | TYPE_ON_BOARD_POPUP | TYPE_DISCOVERY_BOUNCE | TYPE_ALL_APPS_EDU | TYPE_ICON_SURFACE | TYPE_TASKBAR_EDUCATION_DIALOG | TYPE_TASKBAR_ALL_APPS | TYPE_OPTIONS_POPUP_DIALOG | TYPE_TASKBAR_OVERLAY_PROXY - | TYPE_PIN_IME_POPUP; + | TYPE_PIN_IME_POPUP | TYPE_ONE_GRID_MIGRATION_EDU; /** Type of popups that should get exclusive accessibility focus. */ public static final int TYPE_ACCESSIBLE = TYPE_ALL & ~TYPE_DISCOVERY_BOUNCE & ~TYPE_LISTENER & ~TYPE_ALL_APPS_EDU & ~TYPE_TASKBAR_ALL_APPS & ~TYPE_PIN_IME_POPUP - & ~TYPE_WIDGET_RESIZE_FRAME; + & ~TYPE_WIDGET_RESIZE_FRAME & ~TYPE_ONE_GRID_MIGRATION_EDU; // 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 | |