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

Commit 672de429 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Fix flickering when cancel cross activity animation." into udc-qpr-dev

parents 2b30017c 33558d62
Loading
Loading
Loading
Loading
+9 −1
Original line number Diff line number Diff line
@@ -371,7 +371,15 @@ class CrossActivityAnimation {

        @Override
        public void onBackCancelled() {
            mProgressAnimator.onBackCancelled(CrossActivityAnimation.this::finishAnimation);
            mProgressAnimator.onBackCancelled(() -> {
                // mProgressAnimator can reach finish stage earlier than mLeavingProgressSpring,
                // and if we release all animation leash first, the leavingProgressSpring won't
                // able to update the animation anymore, which cause flicker.
                // Here should force update the closing animation target to the final stage before
                // release it.
                setLeavingProgress(0);
                finishAnimation();
            });
        }

        @Override