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

Commit 10880184 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Set mState = mCurrentStableState in onAnimationCancel"" into ub-launcher3-edmonton

parents 48412ca2 d6692ced

src/com/android/launcher3/LauncherStateManager.java

+1 −6
Original line number Diff line number Diff line
@@ -365,12 +365,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
@@ -456,6 +450,7 @@ public class LauncherStateManager { 
    }



    public void setCurrentUserControlledAnimation(AnimatorPlaybackController controller) {

        clearCurrentAnimation();

        setCurrentAnimation(controller.getTarget());

        mConfig.userControlled = true;

        mConfig.playbackController = controller;