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

Commit 482fd7ce authored by William Xiao's avatar William Xiao Committed by Android (Google) Code Review
Browse files

Merge "Clear dream overlay exit animation state when canceling animations." into main

parents 28f6a526 1aa0c2ec

packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/DreamOverlayAnimationsControllerTest.kt

+7 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ class DreamOverlayAnimationsControllerTest : SysuiTestCase() { 
        verify(mockAnimator, atLeastOnce()).addListener(captor.capture())



        captor.allValues.forEach { it.onAnimationEnd(mockAnimator) }

        verify(stateController).setExitAnimationsRunning(false)

        verify(stateController, times(2)).setExitAnimationsRunning(false)

    }



    @Test
@@ -154,4 +154,10 @@ class DreamOverlayAnimationsControllerTest : SysuiTestCase() { 
            }

        )

    }



    @Test

    fun testCancelAnimations_clearsExitAnimationsRunning() {

        controller.cancelAnimations()

        verify(stateController).setExitAnimationsRunning(false)

    }

}

packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayAnimationsController.kt

+1 −0
Original line number Diff line number Diff line
@@ -256,6 +256,7 @@ constructor( 
                it.cancel()

                null

            }

        mOverlayStateController.setExitAnimationsRunning(false)

    }



    private fun blurAnimator(