| commit | 513dea53321dcbd3de456d7aa2e4f3b58c0af5c8 | [log] [tgz] |
|---|---|---|
| author | Wei Sheng Shih <wilsonshih@google.com> | Mon Aug 14 11:44:40 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 14 11:44:40 2023 +0000 |
| tree | 1ff7a9be7ed909237ad62909b1127e32465c0df5 | |
| parent | e682d5fd74cd2c9ec4fc246945e2783757ae46da [diff] | |
| parent | 4f743e5834dd3bbf59491636fc4b3a47336f2aa5 [diff] |
Merge "Fix flickering when cancel cross activity animation." into udc-qpr-dev am: 672de42998 am: 4f743e5834 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24397717 Change-Id: I7be16680e265ac4f84f4f9d9e23d58a479c0bba1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityAnimation.java b/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityAnimation.java index 9181281..114486e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityAnimation.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityAnimation.java
@@ -379,7 +379,15 @@ @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