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

Commit 164d6f29 authored by Paul Hobbs's avatar Paul Hobbs
Browse files

Revert "Always start dismiss transition when the going away anim..." 

Revert submission 27770576

Reason for revert: breaks tests listed in b/346405951

Reverted changes: /q/submissionid:27770576

Change-Id: I4b88e4cb43fdef45fe550d68424dc4945571ac3b
parent ea7d4491

packages/SystemUI/src/com/android/systemui/keyguard/WindowManagerLockscreenVisibilityManager.kt

+8 −10
Original line number Diff line number Diff line
@@ -142,17 +142,15 @@ constructor( 
        nonApps: Array<RemoteAnimationTarget>,

        finishedCallback: IRemoteAnimationFinishedCallback

    ) {

        if (apps.isNotEmpty()) {

            // Ensure that we've started a dismiss keyguard transition. WindowManager can start the

        // going away animation on its own, if an activity launches and then requests dismissing the

        // keyguard. In this case, this is the first and only signal we'll receive to start

        // a transition to GONE. This transition needs to start even if we're not provided an app

        // animation target - it's possible the app is destroyed on creation, etc. but we'll still

        // be unlocking.

            // going away animation on its own, if an activity launches and then requests dismissing

            // the keyguard. In this case, this is the first and only signal we'll receive to start

            // a transition to GONE.

            keyguardTransitionInteractor.startDismissKeyguardTransition(

                reason = "Going away remote animation started"

            )



        if (apps.isNotEmpty()) {

            goingAwayRemoteAnimationFinishedCallback = finishedCallback

            keyguardSurfaceBehindAnimator.applyParamsToSurface(apps[0])

        } else {