Merge "Skip cancel of physics animators if not needed" into tm-qpr-dev am: ea4a7a6cf9 am: 18f2a05ba1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19237416

Change-Id: Icbd2edf8dd192f5e12f965f9bfc27864ab409242
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Winson Chung
2022-07-11 15:53:19 +00:00
committed by Automerger Merge Worker

View File

@@ -829,8 +829,12 @@ class PhysicsAnimator<T> private constructor (target: T) {
/** Cancels all in progress animations on all properties. */
fun cancel() {
cancelAction(flingAnimations.keys)
cancelAction(springAnimations.keys)
if (flingAnimations.size > 0) {
cancelAction(flingAnimations.keys)
}
if (springAnimations.size > 0) {
cancelAction(springAnimations.keys)
}
}
/** Cancels in progress animations on the provided properties only. */