Merge "Skip cancel of physics animators if not needed" into tm-qpr-dev

2022-07-11 15:10:17 +00:00
parent 8eee52bf1d b41f317dd9
commit ea4a7a6cf9
1 changed files with 6 additions and 2 deletions
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/animation/PhysicsAnimator.kt
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/animation/PhysicsAnimator.kt
@@ -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. */