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

Commit 5c2b8d2f authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

Merge "Fix regression in swiping up from lockscreen" into qt-dev am: fafe6dd5 

am: fcf6e8c6

Change-Id: I36a0d156de141071a2b849a92182697968cc5852
parents a3d4c176 fcf6e8c6

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

+13 −5
Original line number Diff line number Diff line
@@ -122,13 +122,21 @@ public class QuickStepContract { 
     * disabled.

     */

    public static boolean isAssistantGestureDisabled(int sysuiStateFlags) {

        // Disable when in screen pinning, immersive, the bouncer is showing, or the notifications

        // are interactive

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

        int disableFlags = SYSUI_STATE_SCREEN_PINNING

                | SYSUI_STATE_NAV_BAR_HIDDEN

                | SYSUI_STATE_BOUNCER_SHOWING

                | SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED;

        return (sysuiStateFlags & disableFlags) != 0;

                | SYSUI_STATE_BOUNCER_SHOWING;

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

            return true;

        }



        // Disable when notifications are showing (only if unlocked)

        if ((sysuiStateFlags & SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED) != 0

                && (sysuiStateFlags & SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING) == 0) {

            return true;

        }



        return false;

    }



    /**