Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small improvements to dialogScreenshotTest {}

Browse Source 
This CL disables the enter/exit animations of the dialog about to be
screenshot tested, and ensures that the dialog is dismissed at the end
of the test.

Test: atest SystemUIGoogleScreenshotTests
Bug: 230832101
Change-Id: I30e26411042bc42181cab38ec706b8ed2a2808f7
This commit is contained in:
Jordan Demeulenaere
2022-06-30 13:02:31 +02:00
parent df74b6ddbc
commit 61d27419aa
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,11 +60,17 @@ class ViewScreenshotTestRule(testSpec: ScreenshotTestSpec) : TestRule {
) { ) {
var dialog: Dialog? = null var dialog: Dialog? = null
activityRule.scenario.onActivity { activity -> activityRule.scenario.onActivity { activity ->
// Make sure that the dialog draws full screen and fits the whole display instead of the
// system bars.
dialog = dialog =
dialogProvider(activity).apply { dialogProvider(activity).apply {
// Make sure that the dialog draws full screen and fits the whole display
// instead of the system bars.
window.setDecorFitsSystemWindows(false) window.setDecorFitsSystemWindows(false)
// Disable enter/exit animations.
create()
window.setWindowAnimations(0)
// Show the dialog.
show() show()
} }
} }
@@ -74,7 +80,11 @@ class ViewScreenshotTestRule(testSpec: ScreenshotTestSpec) : TestRule {
activityRule.scenario.onActivity { activityRule.scenario.onActivity {
// Check that the content is what we expected. // Check that the content is what we expected.
val dialog = dialog ?: error("dialog is null") val dialog = dialog ?: error("dialog is null")
try {
screenshotRule.screenshotTest(goldenIdentifier, dialog.window.decorView) screenshotRule.screenshotTest(goldenIdentifier, dialog.window.decorView)
} finally {
dialog.dismiss()
}
} }
} }
} }