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

Commit f306a224 authored by Hongwei Wang's avatar Hongwei Wang Committed by android-build-merger
Browse files

Merge "Enables back gesture nav in screen pinning" into qt-r1-dev am: f8108f81 

am: c55e4e66

Change-Id: I3d96d002604cad286c89c79966ae1f699398e161
parents cc42ba2e c55e4e66

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

+2 −3
Original line number Diff line number Diff line
@@ -188,9 +188,8 @@ public class QuickStepContract { 
        if ((sysuiStateFlags & SYSUI_STATE_BOUNCER_SHOWING) != 0) {

            return false;

        }

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

        int disableFlags = SYSUI_STATE_SCREEN_PINNING

                | SYSUI_STATE_NAV_BAR_HIDDEN

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

        int disableFlags = SYSUI_STATE_NAV_BAR_HIDDEN

                | SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED

                | SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING;

        return (sysuiStateFlags & disableFlags) != 0;