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

Commit b42b98e8 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: I657b94c7e652a493ea1826d9c5a9e911124883de
parents d2f2ffb1 aae88541

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