commit 68a2d66add6414614884419fd71eb7db52222c8c
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 4a3983c06000a387df92dcb7dd57165da3949e02
parent 69652337ef53094fbb398b7fd9f31709ddb5ef95
parent f99417f8bb574cfae847c7290dc73ab76be59c64

Merge changes from topic "am-5a1fc777-28dd-40a0-967f-68b8f7176b2c" into ub-launcher3-edmonton-polish

* changes:
  [automerger] Reset state amanger, when switching from state animation to task launch animation am: 0cd2a254b2
  Reset state amanger, when switching from state animation to task launch animation

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;