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

Merge "Hide QS whenever user switch occurs" into sc-dev am: cbd9c85921

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

Change-Id: I1134b697db76e0abef93a5da9b3d1e5ddb7906fb
This commit is contained in:
Rajeev Kumar
2021-07-07 16:10:48 +00:00
committed by Automerger Merge Worker
parent a02989742e cbd9c85921
commit d4b86f3591
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -175,7 +175,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
private static final int KEYGUARD_DISPLAY_TIMEOUT_DELAY_DEFAULT = 30000; private static final int KEYGUARD_DISPLAY_TIMEOUT_DELAY_DEFAULT = 30000;
private static final long KEYGUARD_DONE_PENDING_TIMEOUT_MS = 3000; private static final long KEYGUARD_DONE_PENDING_TIMEOUT_MS = 3000;
private static final boolean DEBUG = true; private static final boolean DEBUG = KeyguardConstants.DEBUG;
private static final boolean DEBUG_SIM_STATES = KeyguardConstants.DEBUG_SIM_STATES; private static final boolean DEBUG_SIM_STATES = KeyguardConstants.DEBUG_SIM_STATES;
private final static String TAG = "KeyguardViewMediator"; private final static String TAG = "KeyguardViewMediator";

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

@@ -495,6 +495,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
@Override @Override
public void reset(boolean hideBouncerWhenShowing) { public void reset(boolean hideBouncerWhenShowing) {
if (mShowing) { if (mShowing) {
mNotificationPanelViewController.closeQs();
if (mOccluded && !mDozing) { if (mOccluded && !mDozing) {
mStatusBar.hideKeyguard(); mStatusBar.hideKeyguard();
if (hideBouncerWhenShowing || mBouncer.needsFullscreenBouncer()) { if (hideBouncerWhenShowing || mBouncer.needsFullscreenBouncer()) {