fix: Conflict incoming changes from 15-dev
This commit is contained in:
1 parent
14e352c827
commit
2e76c99dad
1726 files changed
+146970
-95027
No files matched your search
@@ -78,6 +78,7 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
|
||||
TYPE_TASKBAR_PINNING_POPUP,
|
||||
TYPE_PIN_IME_POPUP,
|
||||
TYPE_ONE_GRID_MIGRATION_EDU,
|
||||
TYPE_NUDGE,
|
||||
})
|
||||
@Retention(RetentionPolicy.SOURCE)
|
||||
public @interface FloatingViewType {}
|
||||
@@ -107,9 +108,10 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
|
||||
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_NUDGE = 1 << 24;
|
||||
|
||||
// Custom compose popups
|
||||
public static final int TYPE_COMPOSE_VIEW = 1 << 24;
|
||||
public static final int TYPE_COMPOSE_VIEW = 1 << 25;
|
||||
|
||||
public static final int TYPE_ALL = TYPE_FOLDER | TYPE_ACTION_POPUP
|
||||
| TYPE_WIDGETS_BOTTOM_SHEET | TYPE_WIDGET_RESIZE_FRAME | TYPE_WIDGETS_FULL_SHEET
|
||||
@@ -118,14 +120,15 @@ 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_ONE_GRID_MIGRATION_EDU | TYPE_COMPOSE_VIEW;
|
||||
| TYPE_TASKBAR_PINNING_POPUP | TYPE_PIN_IME_POPUP | TYPE_ONE_GRID_MIGRATION_EDU
|
||||
| TYPE_NUDGE | TYPE_COMPOSE_VIEW;
|
||||
|
||||
// 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_ONE_GRID_MIGRATION_EDU | TYPE_COMPOSE_VIEW;
|
||||
| TYPE_PIN_IME_POPUP | TYPE_ONE_GRID_MIGRATION_EDU | TYPE_NUDGE | TYPE_COMPOSE_VIEW;
|
||||
|
||||
/** Type of popups that should get exclusive accessibility focus. */
|
||||
public static final int TYPE_ACCESSIBLE = TYPE_ALL & ~TYPE_DISCOVERY_BOUNCE & ~TYPE_LISTENER
|
||||
@@ -140,7 +143,7 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
|
||||
|
||||
// Floating views that are exclusive to the taskbar overlay window.
|
||||
public static final int TYPE_TASKBAR_OVERLAYS =
|
||||
TYPE_TASKBAR_ALL_APPS | TYPE_TASKBAR_EDUCATION_DIALOG;
|
||||
TYPE_TASKBAR_ALL_APPS | TYPE_TASKBAR_EDUCATION_DIALOG | TYPE_NUDGE;
|
||||
|
||||
// Floating views that a TouchController should not try to intercept touches from.
|
||||
public static final int TYPE_TOUCH_CONTROLLER_NO_INTERCEPT = TYPE_ALL & ~TYPE_DISCOVERY_BOUNCE
|
||||
|
||||
Reference in new issue
Block a user