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

Commit 83f637fa authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

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
parents 859ea2d5 852d9533

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

+1 −0
Original line number Diff line number Diff line
@@ -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);

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) {