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

Merge "Ignore letterbox in two tests"

Browse Source
This commit is contained in:
Nataniel Borges
2020-12-20 08:44:14 +00:00
committed by Android (Google) Code Review
parent 5e1d3dd1be 3bc2c00a53
commit 6c1663167c
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterLegacySplitScreenTest.kt
View File

@@ -59,6 +59,8 @@ class EnterLegacySplitScreenTest(
rotationName: String,
rotation: Int
) : SplitScreenTestBase(rotationName, rotation) {
private val letterBox = "Letterbox"
private val splitScreenSetup: FlickerBuilder
get() = FlickerBuilder(instrumentation).apply {
val testLaunchActivity = "launch_splitScreen_test_activity"
@@ -85,11 +87,6 @@ class EnterLegacySplitScreenTest(
layersTrace {
navBarLayerIsAlwaysVisible()
statusBarLayerIsAlwaysVisible()
visibleLayersShownMoreThanOneConsecutiveEntry(
listOf(launcherPackageName, splitScreenApp.defaultWindowName,
secondaryApp.defaultWindowName,
nonResizeableApp.defaultWindowName)
)
}
windowManagerTrace {
navBarWindowIsAlwaysVisible()
@@ -116,6 +113,9 @@ class EnterLegacySplitScreenTest(
dockedStackPrimaryBoundsIsVisible(
rotation, splitScreenApp.defaultWindowName, 169271943)
dockedStackDividerBecomesVisible()
visibleLayersShownMoreThanOneConsecutiveEntry(
listOf(launcherPackageName, splitScreenApp.defaultWindowName)
)
}
windowManagerTrace {
end {
@@ -147,6 +147,10 @@ class EnterLegacySplitScreenTest(
dockedStackSecondaryBoundsIsVisible(
rotation, secondaryApp.defaultWindowName, 169271943)
dockedStackDividerBecomesVisible()
visibleLayersShownMoreThanOneConsecutiveEntry(
listOf(launcherPackageName, splitScreenApp.defaultWindowName,
secondaryApp.defaultWindowName)
)
}
windowManagerTrace {
end {
@@ -176,6 +180,9 @@ class EnterLegacySplitScreenTest(
assertions {
layersTrace {
dockedStackDividerIsInvisible()
visibleLayersShownMoreThanOneConsecutiveEntry(
listOf(launcherPackageName, nonResizeableApp.defaultWindowName)
)
}
windowManagerTrace {
end {
@@ -207,6 +214,10 @@ class EnterLegacySplitScreenTest(
val displayBounds = WindowUtils.getDisplayBounds(rotation)
this.hasVisibleRegion(nonResizeableApp.defaultWindowName, displayBounds)
}
visibleLayersShownMoreThanOneConsecutiveEntry(
listOf(launcherPackageName, splitScreenApp.defaultWindowName,
nonResizeableApp.defaultWindowName, letterBox)
)
}
windowManagerTrace {
end {
@@ -239,6 +250,10 @@ class EnterLegacySplitScreenTest(
val displayBounds = WindowUtils.getDisplayBounds(rotation)
this.hasVisibleRegion(nonResizeableApp.defaultWindowName, displayBounds)
}
visibleLayersShownMoreThanOneConsecutiveEntry(
listOf(launcherPackageName, splitScreenApp.defaultWindowName,
nonResizeableApp.defaultWindowName, letterBox)
)
}
windowManagerTrace {
end {