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

Commit 1f7fc92a authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Android Build Coastguard Worker
Browse files

Fix flicker in cross-activity-back-animation 

Bug: 347861186
Flag: com.android.window.flags.predictive_back_system_anims
Test: Manual, i.e. verifying that flicker is not reproducible with the CL applied
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:50f9622210e11c7463d9f7a2e95b6940c7b6c33c)
Merged-In: I5464afbffab182e96acae104cf0471bbaf0a056b
Change-Id: I5464afbffab182e96acae104cf0471bbaf0a056b
parent f56f0add

libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityBackAnimation.kt

+3 −0
Original line number Diff line number Diff line
@@ -324,6 +324,7 @@ abstract class CrossActivityBackAnimation( 
        enteringHasSameLetterbox = false

        lastPostCommitFlingScale = SPRING_SCALE

        gestureProgress = 0f

        triggerBack = false

    }



    protected fun applyTransform(
@@ -499,10 +500,12 @@ abstract class CrossActivityBackAnimation( 
        }



        override fun onBackCancelled() {

            triggerBack = false

            progressAnimator.onBackCancelled { finishAnimation() }

        }



        override fun onBackInvoked() {

            triggerBack = true

            progressAnimator.reset()

            onGestureCommitted(progressAnimator.velocity)

        }