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

Commit e19fbbbc authored by Tony Wickham's avatar Tony Wickham Committed by Automerger Merge Worker
Browse files

Merge "Set mState = mCurrentStableState in onAnimationCancel()" into tm-dev am: b73c57b2 

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



Change-Id: Idfa00f49497919359422f0e8501655920c3291ed
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 73a875ee b73c57b2

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

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 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

 */
@@ -27,6 +29,7 @@ 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

+7 −1
Original line number Diff line number Diff line
@@ -335,7 +335,13 @@ 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(state);

                onStateTransitionStart(mCancelled ? mCurrentStableState : state);

            }



            @Override

            public void onAnimationCancel(Animator animation) {

                super.onAnimationCancel(animation);

                mState = mCurrentStableState;

            }



            @Override