Merge "Fix SpringAnimation class cast exception." into tm-qpr-dev am: 5ce1b5d682 am: 7bb55bb2b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20332766 Change-Id: I1d0de54b5b924959a8422106f6d1d8c3af9fa85c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -219,12 +219,14 @@ public class AnimationHandler {
|
||||
return;
|
||||
}
|
||||
for (int i = 0; i < mAnimationCallbacks.size(); ++i) {
|
||||
Animator animator = ((Animator) mAnimationCallbacks.get(i));
|
||||
if (animator != null
|
||||
&& animator.getTotalDuration() == Animator.DURATION_INFINITE
|
||||
&& !animator.isPaused()) {
|
||||
mPausedAnimators.add(animator);
|
||||
animator.pause();
|
||||
AnimationFrameCallback callback = mAnimationCallbacks.get(i);
|
||||
if (callback instanceof Animator) {
|
||||
Animator animator = ((Animator) callback);
|
||||
if (animator.getTotalDuration() == Animator.DURATION_INFINITE
|
||||
&& !animator.isPaused()) {
|
||||
mPausedAnimators.add(animator);
|
||||
animator.pause();
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user