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
2018-05-29 22:16:05 +00:00
parent 298f29d84f 4cd3f2280c
commit bc72fb2376
1 changed files with 6 additions and 1 deletions
@@ -347,6 +347,12 @@ public class LauncherStateManager {
                }
            }

+            @Override
+            public void onAnimationCancel(Animator animation) {
+                super.onAnimationCancel(animation);
+                mState = mCurrentStableState;
+            }
+
            @Override
            public void onAnimationSuccess(Animator animator) {
                // Run any queued runnables
@@ -432,7 +438,6 @@ public class LauncherStateManager {
    }

    public void setCurrentUserControlledAnimation(AnimatorPlaybackController controller) {
-        clearCurrentAnimation();
        setCurrentAnimation(controller.getTarget());
        mConfig.userControlled = true;
        mConfig.playbackController = controller;