commit | 0cdb1569981f36f77a047b8200079841c3e15dbf | [log] [tgz] |
---|---|---|
author | Beverly <beverlyt@google.com> | Wed Jun 08 15:34:50 2022 +0000 |
committer | Beverly Tai <beverlyt@google.com> | Wed Jun 08 15:36:19 2022 +0000 |
tree | 4387c9cd9649666be16bd7a977edc5fcb2f1135d | |
parent | 20de84c795c0520cbcbdb8fa11cb3d61fbdaa1d4 [diff] |
Use fadeoutDuration in keyguard fadeout It was mistakenly removed in ag/18368628 Test: manual Bug: 234593480 Change-Id: Ia933ef5eb2fbeec0195bf829286e468a644ee838
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java index 83f0bcf3..1ffadb4 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -3806,6 +3806,7 @@ pw.println(" enabledByUser=" + mBiometricEnabledForUser.get(userId)); pw.println(" mSecureCameraLaunched=" + mSecureCameraLaunched); pw.println(" mBouncerFullyShown=" + mBouncerFullyShown); + pw.println(" mNeedsSlowUnlockTransition=" + mNeedsSlowUnlockTransition); } mListenModels.print(pw);
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 11e9ae9..97439b8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
@@ -831,7 +831,7 @@ executeAfterKeyguardGoneAction(); boolean wakeUnlockPulsing = mBiometricUnlockController.getMode() == MODE_WAKE_AND_UNLOCK_PULSING; - mCentralSurfaces.setKeyguardFadingAway(startTime, delay, 0); + mCentralSurfaces.setKeyguardFadingAway(startTime, delay, fadeoutDuration); mBiometricUnlockController.startKeyguardFadingAway(); hideBouncer(true /* destroyView */); if (wakeUnlockPulsing) {