commit b574095bf84a00acba1fe9722afefbc366526188
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jul 28 11:30:54 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 28 11:30:54 2021 +0000
tree 37691a969df5b3e5990bb40ab1d76c38568fa36e
parent 8e83f311003e0aa21eb6e59ff6b91ea19e82557e
parent c35c6b8863305692bf0358ba5da0a38644cfedb0

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

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