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

Commit 6b67555e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Set mState = mCurrentStableState in onAnimationCancel()"" into... 

Merge "Revert "Set mState = mCurrentStableState in onAnimationCancel()"" into tm-dev am: 4608bd00 am: 64be3ba8

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18344362



Change-Id: I8a1586bb204f87f89060ecc311b65bb64594a921
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 913e8573 64be3ba8

src/com/android/launcher3/anim/AnimationSuccessListener.java

+0 −3
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ package com.android.launcher3.anim; 
import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;



import androidx.annotation.CallSuper;



/**

 * Extension of {@link AnimatorListenerAdapter} for listening for non-cancelled animations

 */
@@ -29,7 +27,6 @@ public abstract class AnimationSuccessListener extends AnimatorListenerAdapter { 
    protected boolean mCancelled = false;



    @Override

    @CallSuper

    public void onAnimationCancel(Animator animation) {

        mCancelled = true;

    }

src/com/android/launcher3/statemanager/StateManager.java

+1 −7
Original line number Diff line number Diff line
@@ -335,13 +335,7 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> { 
            @Override

            public void onAnimationStart(Animator animation) {

                // Change the internal state only when the transition actually starts

                onStateTransitionStart(mCancelled ? mCurrentStableState : state);

            }



            @Override

            public void onAnimationCancel(Animator animation) {

                super.onAnimationCancel(animation);

                mState = mCurrentStableState;

                onStateTransitionStart(state);

            }



            @Override