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

Commit ed37da85 authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-125d8586-dd81-455b-b3e8-107829f04796" into... 

Merge changes from topic "am-125d8586-dd81-455b-b3e8-107829f04796" into ub-launcher3-edmonton-polish

* changes:
  [automerger] Set mState = mCurrentStableState in onAnimationCancel am: 8935d951
  Set mState = mCurrentStableState in onAnimationCancel
parents 5ec7fbd3 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;