Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23ef0eda authored by Brian Isganitis's avatar Brian Isganitis Committed by Android (Google) Code Review
Browse files

Merge "Remove types PIN_IME_POPUP and TASKBAR_ALL_APPS from TYPE_ACCESSIBILE." into main

parents 5836cec7 a2b32958

src/com/android/launcher3/AbstractFloatingView.java

+7 −4
Original line number Diff line number Diff line
@@ -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,8 @@ 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;

    public static final int TYPE_ALL_EXCEPT_ON_BOARD_POPUP = TYPE_ALL & ~TYPE_ON_BOARD_POPUP

            & ~TYPE_PIN_IME_POPUP;



    protected boolean mIsOpen;