From d6692cedffa18301ea16ff30b5f4558ba0ee5983 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 6 Jun 2018 18:41:32 +0000
Subject: [PATCH] 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 | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/com/android/launcher3/LauncherStateManager.java b/src/com/android/launcher3/LauncherStateManager.java
index 02fa916b14..b5eef8bd3f 100644
--- a/src/com/android/launcher3/LauncherStateManager.java
+++ b/src/com/android/launcher3/LauncherStateManager.java
@@ -347,12 +347,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
@@ -438,6 +432,7 @@ public class LauncherStateManager {
     }
 
     public void setCurrentUserControlledAnimation(AnimatorPlaybackController controller) {
+        clearCurrentAnimation();
         setCurrentAnimation(controller.getTarget());
         mConfig.userControlled = true;
         mConfig.playbackController = controller;