commit d6692cedffa18301ea16ff30b5f4558ba0ee5983
author Sunny Goyal <sunnygoyal@google.com> Wed Jun 06 18:41:32 2018 +0000
committer Sunny Goyal <sunnygoyal@google.com> Wed Jun 06 18:47:59 2018 +0000
tree cf48d8c714edabd940de7f55082d3aac33091f72
parent 8935d9515c17db0d717757022d9d2442153ecf0d

Revert "Set mState = mCurrentStableState in onAnimationCancel"

This reverts commit 8935d9515c17db0d717757022d9d2442153ecf0d.

Reason for revert:
Bug: 109814458
Bug: 79935289

Change-Id: I33e4933a68060b6055ad7af8e45cffceec14880d

src/com/android/launcher3/LauncherStateManager.java

diff --git a/src/com/android/launcher3/LauncherStateManager.java b/src/com/android/launcher3/LauncherStateManager.java
index 02fa916..b5eef8b 100644
--- a/src/com/android/launcher3/LauncherStateManager.java
+++ b/src/com/android/launcher3/LauncherStateManager.java
@@ -348,12 +348,6 @@
             }
 
             @Override
-            public void onAnimationCancel(Animator animation) {
-                super.onAnimationCancel(animation);
-                mState = mCurrentStableState;
-            }
-
-            @Override
             public void onAnimationSuccess(Animator animator) {
                 // Run any queued runnables
                 if (onCompleteRunnable != null) {
@@ -438,6 +432,7 @@
     }
 
     public void setCurrentUserControlledAnimation(AnimatorPlaybackController controller) {
+        clearCurrentAnimation();
         setCurrentAnimation(controller.getTarget());
         mConfig.userControlled = true;
         mConfig.playbackController = controller;