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

Commit d7906887 authored by Lucas Silva's avatar Lucas Silva Committed by Automerger Merge Worker
Browse files

Merge "Fix issue where back button causes shade to appear over bouncer." into... 

Merge "Fix issue where back button causes shade to appear over bouncer." into tm-qpr-dev am: 1097ed3c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17665298



Change-Id: I912fc7e4a724eab2e419e2cdc718e11d30249f7b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 993c44aa 1097ed3c

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java

+9 −4
Original line number Diff line number Diff line
@@ -3252,9 +3252,13 @@ public class CentralSurfaces extends CoreStartable implements 
    }



    public boolean onBackPressed() {

        boolean isScrimmedBouncer = mScrimController.getState() == ScrimState.BOUNCER_SCRIMMED;

        if (mStatusBarKeyguardViewManager.onBackPressed(isScrimmedBouncer /* hideImmediately */)) {

            if (isScrimmedBouncer) {

        final boolean isScrimmedBouncer =

                mScrimController.getState() == ScrimState.BOUNCER_SCRIMMED;

        final boolean isBouncerOverDream = isBouncerShowingOverDream();



        if (mStatusBarKeyguardViewManager.onBackPressed(

                isScrimmedBouncer || isBouncerOverDream /* hideImmediately */)) {

            if (isScrimmedBouncer || isBouncerOverDream) {

                mStatusBarStateController.setLeaveOpenOnKeyguardHide(false);

            } else {

                mNotificationPanelViewController.expandWithoutQs();
@@ -3276,7 +3280,8 @@ public class CentralSurfaces extends CoreStartable implements 
        if (mNotificationPanelViewController.closeUserSwitcherIfOpen()) {

            return true;

        }

        if (mState != StatusBarState.KEYGUARD && mState != StatusBarState.SHADE_LOCKED) {

        if (mState != StatusBarState.KEYGUARD && mState != StatusBarState.SHADE_LOCKED

                && !isBouncerOverDream) {

            if (mNotificationPanelViewController.canPanelBeCollapsed()) {

                mShadeController.animateCollapsePanels();

            }