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

Commit be30a630 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Ensure end action is called if keyguard animation is cancelled" into...

Merge "Ensure end action is called if keyguard animation is cancelled" into sc-v2-dev am: 517f6aed am: ec93d4fe

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

Change-Id: I73e126c7049a12f50002adc4ad87ee1f83f67048
parents 2f9c923c ec93d4fe
Loading
Loading
Loading
Loading
+14 −12
Original line number Diff line number Diff line
@@ -145,14 +145,15 @@ class UnlockedScreenOffAnimationController @Inject constructor(
                .setDuration(duration.toLong())
                .setInterpolator(Interpolators.FAST_OUT_SLOW_IN)
                .alpha(1f)
                .withEndAction {
                .setListener(object : AnimatorListenerAdapter() {
                    override fun onAnimationEnd(animation: Animator?) {
                        aodUiAnimationPlaying = false

                        // Lock the keyguard if it was waiting for the screen off animation to end.
                        keyguardViewMediatorLazy.get().maybeHandlePendingLock()

                    // Tell the StatusBar to become keyguard for real - we waited on that since it
                    // is slow and would have caused the animation to jank.
                        // Tell the StatusBar to become keyguard for real - we waited on that since
                        // it is slow and would have caused the animation to jank.
                        statusBar.updateIsKeyguard()

                        // Run the callback given to us by the KeyguardVisibilityHelper.
@@ -161,6 +162,7 @@ class UnlockedScreenOffAnimationController @Inject constructor(
                        // Done going to sleep, reset this flag.
                        decidedToAnimateGoingToSleep = null
                    }
                })
                .start()
    }