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

Commit a36d566e authored by Selim Cinek's avatar Selim Cinek
Browse files

Handling another case where an endlistener would not be called 

This didn't really affect production currently, but the current
clean up listener doesn't call the end listener of the animation
directly passed in.
Let's make sure that delayed cancelled animations also call this
end listener

Bug: 417008364
Test: atest SystemUITests
Flag: com.android.systemui.physical_notification_movement
Change-Id: Icda99013874e91bf51de90fcf054ad69179cc7e3
parent cc77d82a

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/PhysicsPropertyAnimatorTest.kt

+11 −0
Original line number Diff line number Diff line
@@ -224,6 +224,15 @@ class PhysicsPropertyAnimatorTest : SysuiTestCase() { 
    @Test

    fun testEndedBeforeStartingCleanupHandler() {

        effectiveProperty.setValue(view, 100f)

        val finishListener2 = Mockito.mock(DynamicAnimation.OnAnimationEndListener::class.java)

        val animationProperties: AnimationProperties =

            object : AnimationProperties() {

                override fun getAnimationEndListener(

                    property: Property<*, *>?

                ): DynamicAnimation.OnAnimationEndListener {

                    return finishListener2

                }

            }

        animationProperties.setDelay(200)

        PhysicsPropertyAnimator.setProperty(

            view,
@@ -240,6 +249,8 @@ class PhysicsPropertyAnimatorTest : SysuiTestCase() { 
        Assert.assertTrue(propertyData.offset == 0f)

        Assert.assertTrue(propertyData.animator == null)

        Assert.assertTrue(propertyData.doubleOvershootAvoidingListener == null)

        Mockito.verify(finishListener)?.onAnimationEnd(any(), any(), any(), any())

        Mockito.verify(finishListener2).onAnimationEnd(any(), any(), any(), any())

    }



    @Test

packages/SystemUI/src/com/android/systemui/statusbar/notification/PhysicsPropertyAnimator.kt

+4 −0
Original line number Diff line number Diff line
@@ -223,6 +223,10 @@ private fun startAnimation( 
            0f /* value */,

            0f /* velocity */

        )

        endListener?.onAnimationEnd(propertyData.animator,

            cancelled,

            0f /* value */,

            0f /* velocity */)

        propertyData.animator = null

        propertyData.doubleOvershootAvoidingListener = null

        propertyData.offset = 0f