Merge "Ignore letterbox in two tests"

1 files changed, 20 insertions, 5 deletions

diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterLegacySplitScreenTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterLegacySplitScreenTest.kt
index 277efa911dba..b33fa55c2be1 100644
--- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterLegacySplitScreenTest.kt
+++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterLegacySplitScreenTest.kt
@@ -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 {