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

Commit 1ec2b5ea authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I5f9d4ff5bc888dfa2938110bc1a604687d914d4a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6eaadeaa 4f615e81

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