diff options
| author | Tony Wickham <twickham@google.com> | 2018-05-29 22:16:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-29 22:16:05 +0000 |
| commit | ad361780fecd1773c0a81786130c1c83626bf5c9 (patch) | |
| tree | bb245bf47f2a229fff3feb92a7f0ad3b4b602cee | |
| parent | ad85852cc09789f346d600f81284bc9dde8c3583 (diff) | |
| parent | 8935d9515c17db0d717757022d9d2442153ecf0d (diff) | |
| download | android_packages_apps_Trebuchet-ad361780fecd1773c0a81786130c1c83626bf5c9.tar.gz android_packages_apps_Trebuchet-ad361780fecd1773c0a81786130c1c83626bf5c9.tar.bz2 android_packages_apps_Trebuchet-ad361780fecd1773c0a81786130c1c83626bf5c9.zip | |
Merge "Set mState = mCurrentStableState in onAnimationCancel" into ub-launcher3-edmonton
| -rw-r--r-- | src/com/android/launcher3/LauncherStateManager.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/launcher3/LauncherStateManager.java b/src/com/android/launcher3/LauncherStateManager.java index b5eef8bd3..02fa916b1 100644 --- a/src/com/android/launcher3/LauncherStateManager.java +++ b/src/com/android/launcher3/LauncherStateManager.java @@ -348,6 +348,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 if (onCompleteRunnable != null) { @@ -432,7 +438,6 @@ public class LauncherStateManager { } public void setCurrentUserControlledAnimation(AnimatorPlaybackController controller) { - clearCurrentAnimation(); setCurrentAnimation(controller.getTarget()); mConfig.userControlled = true; mConfig.playbackController = controller; |