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

Merge "Don't reset the keyguard on occlusion if it's going away." into tm-d1-dev am: f50462e680

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

Change-Id: If252268e1122d28060d4d3ffeb7bd5247e81a781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-08-04 12:10:23 +00:00
committed by Automerger Merge Worker
parent ac22adf36c f50462e680
commit 801407daf0
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -733,8 +733,10 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
} }
mNotificationShadeWindowController.setKeyguardOccluded(mOccluded); mNotificationShadeWindowController.setKeyguardOccluded(mOccluded);
// setDozing(false) will call reset once we stop dozing. // setDozing(false) will call reset once we stop dozing. Also, if we're going away, there's
if (!mDozing) { // no need to reset the keyguard views as we'll be gone shortly. Resetting now could cause
// unexpected visible behavior if the keyguard is still visible as we're animating unlocked.
if (!mDozing && !mKeyguardStateController.isKeyguardGoingAway()) {
// If Keyguard is reshown, don't hide the bouncer as it might just have been requested // If Keyguard is reshown, don't hide the bouncer as it might just have been requested
// by a FLAG_DISMISS_KEYGUARD_ACTIVITY. // by a FLAG_DISMISS_KEYGUARD_ACTIVITY.
reset(isOccluding /* hideBouncerWhenShowing*/); reset(isOccluding /* hideBouncerWhenShowing*/);