Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cd3f228 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
Browse files

[automerger] Set mState = mCurrentStableState in onAnimationCancel am: 8935d951 am: 556a97d9 

Change-Id: I5de9060970fe6f8cb87f45d2e27ec591c4db543c
parents eaf8df5d 556a97d9

src/com/android/launcher3/LauncherStateManager.java

+6 −1
Original line number Diff line number Diff line
@@ -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;