Merge "Fix missing call to super cancel method" into tm-qpr-dev

This commit is contained in:
Winson Chung authored and Android (Google) Code Review committed 2022-09-09 16:16:09 +00:00
commit 607a976635
2 files changed
+4

No files matched your search

@@ -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;
}
@@ -345,6 +345,7 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
@Override
public void onAnimationCancel(Animator animation) {
super.onAnimationCancel(animation);
onStateTransitionFailed(state);
}
};