commit 556a97d9d66787eac6ec664fffc081adda0b3a0f
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Tue May 29 22:03:16 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Tue May 29 22:03:16 2018 +0000
tree 13dabab10f25dbb8657c10fedc5ad5d79a293249
parent d715070fe8c237acde82e47f025aa9d414944c1d
parent 8935d9515c17db0d717757022d9d2442153ecf0d

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

Change-Id: Ib02a0b19494b8c71576145dc1bd9d45dfd36c399

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;