commit 75f3bee86aafb9b63b5ebe277c325696cb96d591
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 18 22:16:16 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 18 22:16:16 2022 +0000
tree 26165da2e0f6c09e28419677b4aa8bc1fc349dd4
parent 05d17176b1b32804457ca9027edb726813ec3664
parent e1783274c205ca76c5ec85c685ae3fa426687da0

Merge "Revert "Set mState = mCurrentStableState in onAnimationCancel()"" into tm-dev am: 4608bd00dc am: e1783274c2

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

Change-Id: Ib5298d11565934e895619ecae1a29f454cac697d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

diff --git a/src/com/android/launcher3/anim/AnimationSuccessListener.java b/src/com/android/launcher3/anim/AnimationSuccessListener.java
index 6196df2..a312070 100644
--- a/src/com/android/launcher3/anim/AnimationSuccessListener.java
+++ b/src/com/android/launcher3/anim/AnimationSuccessListener.java
@@ -19,8 +19,6 @@
 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 @@
     protected boolean mCancelled = false;
 
     @Override
-    @CallSuper
     public void onAnimationCancel(Animator animation) {
         mCancelled = true;
     }

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

diff --git a/src/com/android/launcher3/statemanager/StateManager.java b/src/com/android/launcher3/statemanager/StateManager.java
index 9f50ff9..2aa9dde 100644
--- a/src/com/android/launcher3/statemanager/StateManager.java
+++ b/src/com/android/launcher3/statemanager/StateManager.java
@@ -335,13 +335,7 @@
             @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