diff options
| author | Xin Li <delphij@google.com> | 2024-03-07 06:41:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-07 06:41:07 +0000 |
| commit | 17dabff1dd38e8f0e08736176a8a587e039e610a (patch) | |
| tree | bd40604eb4b00a1a0e63edfe28cb0ebe33f23029 /src/com/android/launcher3/AbstractFloatingView.java | |
| parent | ded14cc2110e39408f74abac8a83e0a0f16608d2 (diff) | |
| parent | 7e8ae158f4a73ee580c468d71ca9a1df6f90a8cd (diff) | |
| download | Launcher3-17dabff1dd38e8f0e08736176a8a587e039e610a.tar.gz | |
Merge "Merge Android 14 QPR2 to AOSP main" into main
Diffstat (limited to 'src/com/android/launcher3/AbstractFloatingView.java')
| -rw-r--r-- | src/com/android/launcher3/AbstractFloatingView.java | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java index b845c88d23..f72c55615c 100644 --- a/src/com/android/launcher3/AbstractFloatingView.java +++ b/src/com/android/launcher3/AbstractFloatingView.java @@ -104,6 +104,7 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch public static final int TYPE_ADD_TO_HOME_CONFIRMATION = 1 << 19; 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_ALL = TYPE_FOLDER | TYPE_ACTION_POPUP | TYPE_WIDGETS_BOTTOM_SHEET | TYPE_WIDGET_RESIZE_FRAME | TYPE_WIDGETS_FULL_SHEET @@ -112,17 +113,18 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch | TYPE_ICON_SURFACE | TYPE_DRAG_DROP_POPUP | TYPE_PIN_WIDGET_FROM_EXTERNAL_POPUP | TYPE_WIDGETS_EDUCATION_DIALOG | 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_TASKBAR_OVERLAY_PROXY | TYPE_TASKBAR_PINNING_POPUP | TYPE_PIN_IME_POPUP; // 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_WIDGETS_EDUCATION_DIALOG | TYPE_TASKBAR_EDUCATION_DIALOG | TYPE_TASKBAR_ALL_APPS | TYPE_OPTIONS_POPUP_DIALOG - | TYPE_TASKBAR_OVERLAY_PROXY; + | TYPE_TASKBAR_OVERLAY_PROXY | TYPE_PIN_IME_POPUP; + /** 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_ALL_APPS_EDU & ~TYPE_TASKBAR_ALL_APPS & ~TYPE_PIN_IME_POPUP; // 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 | @@ -133,7 +135,12 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch public static final int TYPE_TASKBAR_OVERLAYS = TYPE_TASKBAR_ALL_APPS | TYPE_TASKBAR_EDUCATION_DIALOG; - public static final int TYPE_ALL_EXCEPT_ON_BOARD_POPUP = TYPE_ALL & ~TYPE_ON_BOARD_POPUP; + // 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 + & ~TYPE_LISTENER & ~TYPE_TASKBAR_OVERLAYS; + + public static final int TYPE_ALL_EXCEPT_ON_BOARD_POPUP = TYPE_ALL & ~TYPE_ON_BOARD_POPUP + & ~TYPE_PIN_IME_POPUP; protected boolean mIsOpen; |