Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18f2a05b authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I0296265e2993f0570ee69b4266b2207b63c6e9dd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cd34b85c ea4a7a6c

libs/WindowManager/Shell/src/com/android/wm/shell/animation/PhysicsAnimator.kt

+6 −2
Original line number Diff line number Diff line
@@ -829,9 +829,13 @@ class PhysicsAnimator<T> private constructor (target: T) { 


    /** Cancels all in progress animations on all properties. */

    fun cancel() {

        if (flingAnimations.size > 0) {

            cancelAction(flingAnimations.keys)

        }

        if (springAnimations.size > 0) {

            cancelAction(springAnimations.keys)

        }

    }



    /** Cancels in progress animations on the provided properties only. */

    fun cancel(vararg properties: FloatPropertyCompat<in T>) {