Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I2fe2f2019f29c5d42ff9fec9812fc0be919e0d24
This commit is contained in:
Peter Kalauskas
2021-07-13 16:45:33 +00:00
committed by Automerger Merge Worker
parent da0ffb8e4f aae8854106
commit fbb58d855d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}
};

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

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