Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8c91ebf authored Jun 09, 2022 by Automerger Merge Worker

Merge "Merge "Use fadeoutDuration in keyguard fadeout" into tm-d1-dev am:...

Merge "Merge "Use fadeoutDuration in keyguard fadeout" into tm-d1-dev am: 4f615e81 am: 1ec2b5ea" into tm-qpr-dev-plus-aosp am: 83f637fa

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

Change-Id: I763f7e1a2236025b3d912efd2307ac5279556b09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 37158758 83f637fa

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -3790,6 +3790,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);

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -835,7 +835,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) {