Revert "Set mState = mCurrentStableState in onAnimationCancel()"
This reverts commit 22f8ad0dc07c2f0d41ed518502173346764d0919.
Bug: 228276181
Reason for revert: b/232336303, b/232347110
Change-Id: I8fd27e011328c222f0947553197fcf448150fae0
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;
}
diff --git a/src/com/android/launcher3/statemanager/StateManager.java b/src/com/android/launcher3/statemanager/StateManager.java
index 691d4df..1767939 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