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

Commit 47ba203e authored by Peter Kalauskas's avatar Peter Kalauskas Committed by Automerger Merge Worker
Browse files

Merge "Fix bug where QS tiles appeared behind keyguard" into sc-dev am: aae88541 

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

Change-Id: Ibf29b07c31c9620651cd9766aba847abf389f372
parents 429f1475 aae88541

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

+1 −3
Original line number Diff line number Diff line
@@ -685,9 +685,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
            new FalsingManager.FalsingBeliefListener() {

                @Override

                public void onFalse() {

                    // Hides quick settings.

                    mNotificationPanelViewController.resetViews(true);

                    // Hides bouncer and quick-quick settings.

                    // Hides quick settings, bouncer, and quick-quick settings.

                    mStatusBarKeyguardViewManager.reset(true);

                }

            };

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

+3 −1
Original line number Diff line number Diff line
@@ -521,7 +521,9 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
    @Override

    public void reset(boolean hideBouncerWhenShowing) {

        if (mShowing) {

            mNotificationPanelViewController.closeQs();

            // Hide quick settings.

            mNotificationPanelViewController.resetViews(/* animate= */ true);

            // Hide bouncer and quick-quick settings.

            if (mOccluded && !mDozing) {

                mStatusBar.hideKeyguard();

                if (hideBouncerWhenShowing || mBouncer.needsFullscreenBouncer()) {