From 5665482ee69acba2528929066b210eab04d5190f Mon Sep 17 00:00:00 2001 From: Peter Kalauskas Date: Tue, 29 Jun 2021 16:50:02 -0700 Subject: [PATCH] Hide QS whenever user switch occurs Test: In QS, switch between users, ensure that QS closes after "Switching to user..." dialog goes away Test: In Settings, switch between users, ensure everything works the same as previously Bug: 192134653 Bug: 181266300 Change-Id: I7dee4874d6097e6a864ed3e766a4f25beeebd603 --- .../src/com/android/systemui/keyguard/KeyguardViewMediator.java | 2 +- .../systemui/statusbar/phone/StatusBarKeyguardViewManager.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 15f7a1219f3fb..75f77bffa4a0c 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -175,7 +175,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, private static final int KEYGUARD_DISPLAY_TIMEOUT_DELAY_DEFAULT = 30000; 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 final static String TAG = "KeyguardViewMediator"; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java index 0b6884bcdfa49..f49787478bd77 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -495,6 +495,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb @Override public void reset(boolean hideBouncerWhenShowing) { if (mShowing) { + mNotificationPanelViewController.closeQs(); if (mOccluded && !mDozing) { mStatusBar.hideKeyguard(); if (hideBouncerWhenShowing || mBouncer.needsFullscreenBouncer()) {