From 0cdb1569981f36f77a047b8200079841c3e15dbf Mon Sep 17 00:00:00 2001 From: Beverly Date: Wed, 8 Jun 2022 15:34:50 +0000 Subject: Use fadeoutDuration in keyguard fadeout It was mistakenly removed in ag/18368628 Test: manual Bug: 234593480 Change-Id: Ia933ef5eb2fbeec0195bf829286e468a644ee838 --- packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java | 1 + .../android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java index 83f0bcf36a43..1ffadb47c0c9 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -3806,6 +3806,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 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 11e9ae90aef6..97439b8d017d 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 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 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) { -- cgit v1.2.3-59-g8ed1b