diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-06-06 18:51:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-06-06 18:51:46 +0000 |
| commit | 108801840bbc0841adec9e16e33ce4ce427912db (patch) | |
| tree | e682e8ea7c86e3763519053833de4dddab5c775f /src | |
| parent | 48412ca2c98a84f78d30f877fecd096f8f5ee738 (diff) | |
| parent | d6692cedffa18301ea16ff30b5f4558ba0ee5983 (diff) | |
| download | android_packages_apps_Trebuchet-108801840bbc0841adec9e16e33ce4ce427912db.tar.gz android_packages_apps_Trebuchet-108801840bbc0841adec9e16e33ce4ce427912db.tar.bz2 android_packages_apps_Trebuchet-108801840bbc0841adec9e16e33ce4ce427912db.zip | |
Merge "Revert "Set mState = mCurrentStableState in onAnimationCancel"" into ub-launcher3-edmonton
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/LauncherStateManager.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/com/android/launcher3/LauncherStateManager.java b/src/com/android/launcher3/LauncherStateManager.java index 0df9d977e..8b415d68c 100644 --- a/src/com/android/launcher3/LauncherStateManager.java +++ b/src/com/android/launcher3/LauncherStateManager.java @@ -366,12 +366,6 @@ 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) { @@ -456,6 +450,7 @@ public class LauncherStateManager { } public void setCurrentUserControlledAnimation(AnimatorPlaybackController controller) { + clearCurrentAnimation(); setCurrentAnimation(controller.getTarget()); mConfig.userControlled = true; mConfig.playbackController = controller; |