commit 8baae80cdfc9b91a837df927ba118c7c48147a8e
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Feb 01 18:58:56 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 01 18:58:56 2023 +0000
tree f815af81053931d1e13572de3685dced91df5f97
parent 18be12d0ddbff7b3e9faa91d31efd79d1da04e65
parent 4edce0100aed3ca4a3a18c0bdfee38a196e2fee9

Merge "Dispatch onAnimationStart and End to maintain proper state" into tm-qpr-dev

quickstep/src/com/android/quickstep/interaction/AllSetActivity.java

diff --git a/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java b/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java
index e0262d0..0389d07 100644
--- a/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java
+++ b/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java
@@ -240,6 +240,7 @@
         maybeResumeOrPauseBackgroundAnimation();
         if (mSwipeProgress.value >= 1) {
             finishAndRemoveTask();
+            dispatchLauncherAnimStartEnd();
         }
     }
 
@@ -251,6 +252,18 @@
         }
     }
 
+    /**
+     * Should be called when we have successfully reached Launcher, so we dispatch to animation
+     * listeners to ensure the state matches the visual animation that just occurred.
+      */
+    private void dispatchLauncherAnimStartEnd() {
+        if (mLauncherStartAnim != null) {
+            mLauncherStartAnim.dispatchOnStart();
+            mLauncherStartAnim.dispatchOnEnd();
+            mLauncherStartAnim = null;
+        }
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
@@ -259,6 +272,7 @@
         if (mBackgroundAnimatorListener != null) {
             mAnimatedBackground.removeAnimatorListener(mBackgroundAnimatorListener);
         }
+        dispatchLauncherAnimStartEnd();
     }
 
     private AnimatedFloat createSwipeUpProxy(GestureState state) {