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

Commit cb4e28f2 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 am: fbb58d85 

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

Change-Id: I4f0250bb25369540909bead92e67cd2e8dabfa8b
parents e96e8c2b fbb58d85

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

+1 −3
Original line number Diff line number Diff line
@@ -686,9 +686,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()) {