[automerger] Revert "Set mState = mCurrentStableState in onAnimationCancel" am: d6692cedff

Change-Id: Ic38e6db9bb62e04d017db93e906be2be02a33294
2018-06-06 18:48:00 +00:00
parent 4600bfca66 d6692cedff
commit 69652337ef
1 changed files with 1 additions and 6 deletions
@@ -365,12 +365,6 @@ public class LauncherStateManager {
                }
            }

-            @Override
-            public void onAnimationCancel(Animator animation) {
-                super.onAnimationCancel(animation);
-                mState = mCurrentStableState;
-            }
-
            @Override
            public void onAnimationSuccess(Animator animator) {
                // Run any queued runnables
@@ -456,6 +450,7 @@ public class LauncherStateManager {
    }

    public void setCurrentUserControlledAnimation(AnimatorPlaybackController controller) {
+        clearCurrentAnimation();
        setCurrentAnimation(controller.getTarget());
        mConfig.userControlled = true;
        mConfig.playbackController = controller;