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

Commit 696fae49 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere Committed by Automerger Merge Worker
Browse files

Merge "Temporary fix DialogLaunchAnimatorTest#testShowDialogFromView" into... 

Merge "Temporary fix DialogLaunchAnimatorTest#testShowDialogFromView" into sc-v2-dev am: d7b0a362 am: c35d7beb

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

Change-Id: I71a82cc6270408c2774d32355e0365a0fc3f74d7
parents a54d51b0 c35d7beb

packages/SystemUI/tests/src/com/android/systemui/animation/DialogLaunchAnimatorTest.kt

+8 −1
Original line number Diff line number Diff line
@@ -86,7 +86,14 @@ class DialogLaunchAnimatorTest : SysuiTestCase() { 
        assertFalse(dialog.isShowing)



        assertFalse(dialog.onStopCalled)

        runOnMainThreadAndWaitForIdleSync { dialog.dismiss() }

        runOnMainThreadAndWaitForIdleSync {

            // TODO(b/204561691): Remove this call to disableAllCurrentDialogsExitAnimations() and

            // make sure that the test still pass on git_master/cf_x86_64_phone-userdebug in

            // Forrest.

            dialogLaunchAnimator.disableAllCurrentDialogsExitAnimations()



            dialog.dismiss()

        }

        assertFalse(hostDialog.isShowing)

        assertFalse(dialog.isShowing)

        assertTrue(hostDialog.wasDismissed)