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

Commit aae88541 authored by Peter Kalauskas's avatar Peter Kalauskas Committed by Android (Google) Code Review
Browse files

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

parents 5002d711 79a3f02f

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()) {