commit ea1d6f97964fe8d6d466ca840051f5a8505f7377
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jul 28 11:50:51 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jul 28 11:50:51 2021 +0000
tree 384cc0f37f844e910f7e450a0779d02acb9c75e4
parent 8b11c3b5749a8af06a740b8ddf2c87ef376afbab
parent b574095bf84a00acba1fe9722afefbc366526188

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

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

Change-Id: Iec3f27847eb47a608548a2e02f404031454300a2

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();
             }
         }