commit 4cd3f2280c03024005456311bc3367c65f2dfa91
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Tue May 29 22:03:17 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Tue May 29 22:03:17 2018 +0000
tree cf203b49fab91c3ca8b7e606de50252e6b9b2fb9
parent eaf8df5d1584b7affec90f267824e69dbf2eec0c
parent 556a97d9d66787eac6ec664fffc081adda0b3a0f

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

Change-Id: I5de9060970fe6f8cb87f45d2e27ec591c4db543c

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;