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

Commit 54866bd7 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere Committed by Automerger Merge Worker
Browse files

Small improvements to dialogScreenshotTest {} am: 61d27419 am: 73053860 

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



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

packages/SystemUI/screenshot/src/com/android/systemui/testing/screenshot/ViewScreenshotTestRule.kt

+13 −3
Original line number Diff line number Diff line
@@ -60,11 +60,17 @@ class ViewScreenshotTestRule(testSpec: ScreenshotTestSpec) : TestRule { 
    ) {

        var dialog: Dialog? = null

        activityRule.scenario.onActivity { activity ->

            // Make sure that the dialog draws full screen and fits the whole display instead of the

            // system bars.

            dialog =

                dialogProvider(activity).apply {

                    // Make sure that the dialog draws full screen and fits the whole display

                    // instead of the system bars.

                    window.setDecorFitsSystemWindows(false)



                    // Disable enter/exit animations.

                    create()

                    window.setWindowAnimations(0)



                    // Show the dialog.

                    show()

                }

        }
@@ -74,7 +80,11 @@ class ViewScreenshotTestRule(testSpec: ScreenshotTestSpec) : TestRule { 
        activityRule.scenario.onActivity {

            // Check that the content is what we expected.

            val dialog = dialog ?: error("dialog is null")

            try {

                screenshotRule.screenshotTest(goldenIdentifier, dialog.window.decorView)

            } finally {

                dialog.dismiss()

            }

        }

    }

}