commit bc72fb2376354d2209195488019c87ee4b2df445
author Tony Wickham <twickham@google.com> Tue May 29 22:16:05 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 29 22:16:05 2018 +0000
tree 90adfe2e7bc54f65708e2e2ab36d3e99bea7bbab
parent 298f29d84fd348cb2d8a3635656dd25972859d5d
parent 4cd3f2280c03024005456311bc3367c65f2dfa91

Merge changes from topic "am-125d8586-dd81-455b-b3e8-107829f04796" into ub-launcher3-master

* changes:
  [automerger] Set mState = mCurrentStableState in onAnimationCancel am: 8935d9515c am: 556a97d9d6
  [automerger] Set mState = mCurrentStableState in onAnimationCancel am: 8935d9515c
  Set mState = mCurrentStableState in onAnimationCancel

src/com/android/launcher3/LauncherStateManager.java

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