commit b85052d7e561fe7577c1b93e30f1b5ee94cea254
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jul 28 12:05:07 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jul 28 12:05:07 2021 +0000
tree 599f3c0722ad521efa3f2f5f2570fea2182d8fc1
parent a8049d069da47936e74061f13e36367b94c873c5
parent ea1d6f97964fe8d6d466ca840051f5a8505f7377

Merge "Nullify mParallelRunningAnim after it ends to avoid updating it" into sc-v2-dev am: b574095bf8 am: ea1d6f9796

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15406133

Change-Id: Id74b58f9985376be37db4d3347e9f8efd3a854e4

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index c412ece..97f46a5 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1153,6 +1153,12 @@
                     mGestureState.getEndTarget(), duration,
                     mTaskAnimationManager.getCurrentCallbacks());
             if (mParallelRunningAnim != null) {
+                mParallelRunningAnim.addListener(new AnimatorListenerAdapter() {
+                    @Override
+                    public void onAnimationEnd(Animator animation) {
+                        mParallelRunningAnim = null;
+                    }
+                });
                 mParallelRunningAnim.start();
             }
         }