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

Commit 513dea53 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

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

Merge "Fix flickering when cancel cross activity animation." into udc-qpr-dev am: 672de429 am: 4f743e58

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



Change-Id: I7be16680e265ac4f84f4f9d9e23d58a479c0bba1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e682d5fd 4f743e58

libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityAnimation.java

+9 −1
Original line number Diff line number Diff line
@@ -379,7 +379,15 @@ public class CrossActivityAnimation extends ShellBackAnimation { 


        @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