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

Commit daf3a8e0 authored by Chris Göllner's avatar Chris Göllner Committed by Android (Google) Code Review
Browse files

Merge "Convert SysUiState flags from int to long" into main

parents da8c6c9d d359126c

libs/WindowManager/Shell/src/com/android/wm/shell/pip/Pip.java

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ public interface Pip { 
     * @param isSysUiStateValid Is SysUI state valid or not.

     * @param flag Current SysUI state.

     */

    default void onSystemUiStateChanged(boolean isSysUiStateValid, int flag) {

    default void onSystemUiStateChanged(boolean isSysUiStateValid, long flag) {

    }



    /**

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java

+2 −2
Original line number Diff line number Diff line
@@ -847,7 +847,7 @@ public class PipController implements PipTransitionController.PipTransitionCallb 
        }

    }



    private void onSystemUiStateChanged(boolean isValidState, int flag) {

    private void onSystemUiStateChanged(boolean isValidState, long flag) {

        mTouchHandler.onSystemUiStateChanged(isValidState);

    }
@@ -1195,7 +1195,7 @@ public class PipController implements PipTransitionController.PipTransitionCallb 
        }



        @Override

        public void onSystemUiStateChanged(boolean isSysUiStateValid, int flag) {

        public void onSystemUiStateChanged(boolean isSysUiStateValid, long flag) {

            mMainExecutor.execute(() -> {

                PipController.this.onSystemUiStateChanged(isSysUiStateValid, flag);

            });

packages/SystemUI/multivalentTests/src/com/android/systemui/scene/domain/startable/SceneContainerStartableTest.kt

+4 −4
Original line number Diff line number Diff line
@@ -437,12 +437,12 @@ class SceneContainerStartableTest : SysuiTestCase() { 
            runCurrent()

            assertThat(

                    sysUiState.flags and

                        QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED != 0

                        QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED != 0L

                )

                .isTrue()

            assertThat(

                    sysUiState.flags and

                        QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING != 0

                        QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING != 0L

                )

                .isFalse()
@@ -450,12 +450,12 @@ class SceneContainerStartableTest : SysuiTestCase() { 
            runCurrent()

            assertThat(

                    sysUiState.flags and

                        QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED != 0

                        QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED != 0L

                )

                .isFalse()

            assertThat(

                    sysUiState.flags and

                        QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING != 0

                        QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING != 0L

                )

                .isTrue()

        }

packages/SystemUI/shared/src/com/android/systemui/shared/recents/IOverviewProxy.aidl

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ oneway interface IOverviewProxy { 
    /**

     * Sent when some system ui state changes.

     */

    void onSystemUiStateChanged(int stateFlags) = 16;

    void onSystemUiStateChanged(long stateFlags) = 16;



    /**

     * Sent when suggested rotation button could be shown

packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java

+50 −44
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL; 


import static com.android.systemui.shared.Flags.shadeAllowBackGesture;



import android.annotation.IntDef;

import android.annotation.LongDef;

import android.content.Context;

import android.content.res.Resources;

import android.view.ViewConfiguration;
@@ -51,92 +51,94 @@ public class QuickStepContract { 


    // Overview is disabled, either because the device is in lock task mode, or because the device

    // policy has disabled the feature

    public static final int SYSUI_STATE_SCREEN_PINNING = 1 << 0;

    public static final long SYSUI_STATE_SCREEN_PINNING = 1L << 0;

    // The navigation bar is hidden due to immersive mode

    public static final int SYSUI_STATE_NAV_BAR_HIDDEN = 1 << 1;

    public static final long SYSUI_STATE_NAV_BAR_HIDDEN = 1L << 1;

    // The notification panel is expanded and interactive (either locked or unlocked), and the

    // quick settings is not expanded

    public static final int SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED = 1 << 2;

    public static final long SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED = 1L << 2;

    // The keyguard bouncer is showing

    public static final int SYSUI_STATE_BOUNCER_SHOWING = 1 << 3;

    public static final long SYSUI_STATE_BOUNCER_SHOWING = 1L << 3;

    // The navigation bar a11y button should be shown

    public static final int SYSUI_STATE_A11Y_BUTTON_CLICKABLE = 1 << 4;

    public static final long SYSUI_STATE_A11Y_BUTTON_CLICKABLE = 1L << 4;

    // The navigation bar a11y button shortcut is available

    public static final int SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE = 1 << 5;

    public static final long SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE = 1L << 5;

    // The keyguard is showing and not occluded

    public static final int SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING = 1 << 6;

    public static final long SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING = 1L << 6;

    // The recents feature is disabled (either by SUW/SysUI/device policy)

    public static final int SYSUI_STATE_OVERVIEW_DISABLED = 1 << 7;

    public static final long SYSUI_STATE_OVERVIEW_DISABLED = 1L << 7;

    // The home feature is disabled (either by SUW/SysUI/device policy)

    public static final int SYSUI_STATE_HOME_DISABLED = 1 << 8;

    public static final long SYSUI_STATE_HOME_DISABLED = 1L << 8;

    // The keyguard is showing, but occluded

    public static final int SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED = 1 << 9;

    public static final long SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED = 1L << 9;

    // The search feature is disabled (either by SUW/SysUI/device policy)

    public static final int SYSUI_STATE_SEARCH_DISABLED = 1 << 10;

    public static final long SYSUI_STATE_SEARCH_DISABLED = 1L << 10;

    // The notification panel is expanded and interactive (either locked or unlocked), and quick

    // settings is expanded.

    public static final int SYSUI_STATE_QUICK_SETTINGS_EXPANDED = 1 << 11;

    public static final long SYSUI_STATE_QUICK_SETTINGS_EXPANDED = 1L << 11;

    // Winscope tracing is enabled

    public static final int SYSUI_STATE_DISABLE_GESTURE_SPLIT_INVOCATION = 1 << 12;

    public static final long SYSUI_STATE_DISABLE_GESTURE_SPLIT_INVOCATION = 1L << 12;

    // The Assistant gesture should be constrained. It is up to the launcher implementation to

    // decide how to constrain it

    public static final int SYSUI_STATE_ASSIST_GESTURE_CONSTRAINED = 1 << 13;

    public static final long SYSUI_STATE_ASSIST_GESTURE_CONSTRAINED = 1L << 13;

    // The bubble stack is expanded. This means that the home gesture should be ignored, since a

    // swipe up is an attempt to close the bubble stack, but that the back gesture should remain

    // enabled (since it's used to navigate back within the bubbled app, or to collapse the bubble

    // stack.

    public static final int SYSUI_STATE_BUBBLES_EXPANDED = 1 << 14;

    public static final long SYSUI_STATE_BUBBLES_EXPANDED = 1L << 14;

    // A SysUI dialog is showing.

    public static final int SYSUI_STATE_DIALOG_SHOWING = 1 << 15;

    public static final long SYSUI_STATE_DIALOG_SHOWING = 1L << 15;

    // The one-handed mode is active

    public static final int SYSUI_STATE_ONE_HANDED_ACTIVE = 1 << 16;

    public static final long SYSUI_STATE_ONE_HANDED_ACTIVE = 1L << 16;

    // Allow system gesture no matter the system bar(s) is visible or not

    public static final int SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY = 1 << 17;

    public static final long SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY = 1L << 17;

    // The IME is showing

    public static final int SYSUI_STATE_IME_SHOWING = 1 << 18;

    public static final long SYSUI_STATE_IME_SHOWING = 1L << 18;

    // The window magnification is overlapped with system gesture insets at the bottom.

    public static final int SYSUI_STATE_MAGNIFICATION_OVERLAP = 1 << 19;

    public static final long SYSUI_STATE_MAGNIFICATION_OVERLAP = 1L << 19;

    // ImeSwitcher is showing

    public static final int SYSUI_STATE_IME_SWITCHER_SHOWING = 1 << 20;

    public static final long SYSUI_STATE_IME_SWITCHER_SHOWING = 1L << 20;

    // Device dozing/AOD state

    public static final int SYSUI_STATE_DEVICE_DOZING = 1 << 21;

    public static final long SYSUI_STATE_DEVICE_DOZING = 1L << 21;

    // The home feature is disabled (either by SUW/SysUI/device policy)

    public static final int SYSUI_STATE_BACK_DISABLED = 1 << 22;

    public static final long SYSUI_STATE_BACK_DISABLED = 1L << 22;

    // The bubble stack is expanded AND the mange menu for bubbles is expanded on top of it.

    public static final int SYSUI_STATE_BUBBLES_MANAGE_MENU_EXPANDED = 1 << 23;

    public static final long SYSUI_STATE_BUBBLES_MANAGE_MENU_EXPANDED = 1L << 23;

    // The voice interaction session window is showing

    public static final int SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING = 1 << 25;

    public static final long SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING = 1L << 25;

    // Freeform windows are showing in desktop mode

    public static final int SYSUI_STATE_FREEFORM_ACTIVE_IN_DESKTOP_MODE = 1 << 26;

    public static final long SYSUI_STATE_FREEFORM_ACTIVE_IN_DESKTOP_MODE = 1L << 26;

    // Device dreaming state

    public static final int SYSUI_STATE_DEVICE_DREAMING = 1 << 27;

    public static final long SYSUI_STATE_DEVICE_DREAMING = 1L << 27;

    // Whether the device is currently awake (as opposed to asleep, see WakefulnessLifecycle).

    // Note that the device is awake on while waking up on, but not while going to sleep.

    public static final int SYSUI_STATE_AWAKE = 1 << 28;

    public static final long SYSUI_STATE_AWAKE = 1L << 28;

    // Whether the device is currently transitioning between awake/asleep indicated by

    // SYSUI_STATE_AWAKE.

    public static final int SYSUI_STATE_WAKEFULNESS_TRANSITION = 1 << 29;

    public static final long SYSUI_STATE_WAKEFULNESS_TRANSITION = 1L << 29;

    // The notification panel expansion fraction is > 0

    public static final int SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE = 1 << 30;

    public static final long SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE = 1L << 30;

    // When keyguard will be dismissed but didn't start animation yet

    public static final int SYSUI_STATE_STATUS_BAR_KEYGUARD_GOING_AWAY = 1 << 31;

    public static final long SYSUI_STATE_STATUS_BAR_KEYGUARD_GOING_AWAY = 1L << 31;

    // Physical keyboard shortcuts helper is showing

    public static final long SYSUI_STATE_SHORTCUT_HELPER_SHOWING = 1L << 32;



    // Mask for SystemUiStateFlags to isolate SYSUI_STATE_AWAKE and

    // SYSUI_STATE_WAKEFULNESS_TRANSITION, to match WAKEFULNESS_* constants

    public static final int SYSUI_STATE_WAKEFULNESS_MASK =

    public static final long SYSUI_STATE_WAKEFULNESS_MASK =

            SYSUI_STATE_AWAKE | SYSUI_STATE_WAKEFULNESS_TRANSITION;

    // Mirroring the WakefulnessLifecycle#Wakefulness states

    public static final int WAKEFULNESS_ASLEEP = 0;

    public static final int WAKEFULNESS_AWAKE = SYSUI_STATE_AWAKE;

    public static final int WAKEFULNESS_GOING_TO_SLEEP = SYSUI_STATE_WAKEFULNESS_TRANSITION;

    public static final int WAKEFULNESS_WAKING =

    public static final long WAKEFULNESS_ASLEEP = 0;

    public static final long WAKEFULNESS_AWAKE = SYSUI_STATE_AWAKE;

    public static final long WAKEFULNESS_GOING_TO_SLEEP = SYSUI_STATE_WAKEFULNESS_TRANSITION;

    public static final long WAKEFULNESS_WAKING =

            SYSUI_STATE_WAKEFULNESS_TRANSITION | SYSUI_STATE_AWAKE;



    // Whether the back gesture is allowed (or ignored) by the Shade

    public static final boolean ALLOW_BACK_GESTURE_IN_SHADE = shadeAllowBackGesture();



    @Retention(RetentionPolicy.SOURCE)

    @IntDef({SYSUI_STATE_SCREEN_PINNING,

    @LongDef({SYSUI_STATE_SCREEN_PINNING,

            SYSUI_STATE_NAV_BAR_HIDDEN,

            SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED,

            SYSUI_STATE_QUICK_SETTINGS_EXPANDED,
@@ -167,10 +169,11 @@ public class QuickStepContract { 
            SYSUI_STATE_WAKEFULNESS_TRANSITION,

            SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE,

            SYSUI_STATE_STATUS_BAR_KEYGUARD_GOING_AWAY,

            SYSUI_STATE_SHORTCUT_HELPER_SHOWING,

    })

    public @interface SystemUiStateFlags {}



    public static String getSystemUiStateString(int flags) {

    public static String getSystemUiStateString(long flags) {

        StringJoiner str = new StringJoiner("|");

        if ((flags & SYSUI_STATE_SCREEN_PINNING) != 0) {

            str.add("screen_pinned");
@@ -265,6 +268,9 @@ public class QuickStepContract { 
        if ((flags & SYSUI_STATE_STATUS_BAR_KEYGUARD_GOING_AWAY) != 0) {

            str.add("keygrd_going_away");

        }

        if ((flags & SYSUI_STATE_SHORTCUT_HELPER_SHOWING) != 0) {

            str.add("shortcut_helper_showing");

        }



        return str.toString();

    }
@@ -285,13 +291,13 @@ public class QuickStepContract { 
     * Returns whether the specified sysui state is such that the assistant gesture should be

     * disabled.

     */

    public static boolean isAssistantGestureDisabled(int sysuiStateFlags) {

    public static boolean isAssistantGestureDisabled(long sysuiStateFlags) {

        if ((sysuiStateFlags & SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY) != 0) {

            sysuiStateFlags &= ~SYSUI_STATE_NAV_BAR_HIDDEN;

        }

        // Disable when in quick settings, screen pinning, immersive, the bouncer is showing, 

        // or search is disabled

        int disableFlags = SYSUI_STATE_SCREEN_PINNING

        long disableFlags = SYSUI_STATE_SCREEN_PINNING

                | SYSUI_STATE_NAV_BAR_HIDDEN

                | SYSUI_STATE_BOUNCER_SHOWING

                | SYSUI_STATE_SEARCH_DISABLED
@@ -313,7 +319,7 @@ public class QuickStepContract { 
     * Returns whether the specified sysui state is such that the back gesture should be

     * disabled.

     */

    public static boolean isBackGestureDisabled(int sysuiStateFlags, boolean forTrackpad) {

    public static boolean isBackGestureDisabled(long sysuiStateFlags, boolean forTrackpad) {

        // Always allow when the bouncer/global actions/voice session is showing (even on top of

        // the keyguard)

        if ((sysuiStateFlags & SYSUI_STATE_BOUNCER_SHOWING) != 0
@@ -328,9 +334,9 @@ public class QuickStepContract { 
        return (sysuiStateFlags & getBackGestureDisabledMask(forTrackpad)) != 0;

    }



    private static int getBackGestureDisabledMask(boolean forTrackpad) {

    private static long getBackGestureDisabledMask(boolean forTrackpad) {

        // Disable when in immersive, or the notifications are interactive

        int disableFlags = SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING;

        long disableFlags = SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING;

        if (!forTrackpad) {

            disableFlags |= SYSUI_STATE_NAV_BAR_HIDDEN;

        }