commit f75fa0f8e2ec3281caf0d63b5762a7addd56f50e
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 06 18:55:20 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 06 18:55:20 2018 +0000
tree 1c260b646aa871f8e0816d7f40cbe7ddd523fad9
parent 108801840bbc0841adec9e16e33ce4ce427912db
parent 0cd2a254b261fea965f014cc3ea40c31f7fed37b

Merge "Reset state amanger, when switching from state animation to task launch animation" into ub-launcher3-edmonton

src/com/android/launcher3/LauncherStateManager.java

diff --git a/src/com/android/launcher3/LauncherStateManager.java b/src/com/android/launcher3/LauncherStateManager.java
index 0df9d97..8b415d6 100644
--- a/src/com/android/launcher3/LauncherStateManager.java
+++ b/src/com/android/launcher3/LauncherStateManager.java
@@ -366,12 +366,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) {
@@ -456,6 +450,7 @@
     }
 
     public void setCurrentUserControlledAnimation(AnimatorPlaybackController controller) {
+        clearCurrentAnimation();
         setCurrentAnimation(controller.getTarget());
         mConfig.userControlled = true;
         mConfig.playbackController = controller;