Merge "Reduce flicker memory consumption (Pt 3)" into sc-dev am: 3a544c9da5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id5c7f3ef4983da84851170df18dfd15ec30a2f4e

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestCannotPairNonResizeableApps.kt

@@ -54,7 +54,7 @@ class AppPairsTestCannotPairNonResizeableApps(
         @Parameterized.Parameters(name = "{0}")
         @JvmStatic
         fun getParams(): List<Array<Any>> {
-            val testTag = "testAppPairs_unpairPrimaryAndSecondaryApps"
+            val testTag = "testAppPairs_cannotPairNonResizeableApps"
             val testSpec: FlickerBuilder.(Bundle) -> Unit = { configuration ->
                 withTestName {
                     buildTestTag(testTag, configuration)
@@ -71,7 +71,7 @@ class AppPairsTestCannotPairNonResizeableApps(
                         appPairsDividerIsInvisible()
                     }
                     windowManagerTrace {
-                        end {
+                        end("onlyResizeableAppWindowVisible") {
                             val nonResizeableApp = nonResizeableApp
                             require(nonResizeableApp != null) {
                                 "Non resizeable app not initialized"

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestPairPrimaryAndSecondaryApps.kt

@@ -76,7 +76,7 @@ class AppPairsTestPairPrimaryAndSecondaryApps(
                         }
                     }
                     windowManagerTrace {
-                        end {
+                        end("bothAppWindowsVisible") {
                             isVisible(primaryApp.defaultWindowName)
                             isVisible(secondaryApp.defaultWindowName)
                         }

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestUnpairPrimaryAndSecondaryApps.kt

@@ -85,7 +85,7 @@ class AppPairsTestUnpairPrimaryAndSecondaryApps(
                         }
                     }
                     windowManagerTrace {
-                        end {
+                        end("bothAppWindowsInvisible") {
                             isInvisible(primaryApp.defaultWindowName)
                             isInvisible(secondaryApp.defaultWindowName)
                         }

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsInAppPairsMode.kt

@@ -66,7 +66,7 @@ class RotateTwoLaunchedAppsInAppPairsMode(
             val instrumentation = InstrumentationRegistry.getInstrumentation()
             val testSpec: FlickerBuilder.(Bundle) -> Unit = { configuration ->
                 withTestName {
-                    buildTestTag("testRotateAndEnterAppPairsMode", configuration)
+                    buildTestTag("testRotateTwoLaunchedAppsInAppPairsMode", configuration)
                 }
                 transitions {
                     executeShellCommand(composePairsCommand(
@@ -88,7 +88,7 @@ class RotateTwoLaunchedAppsInAppPairsMode(
                     windowManagerTrace {
                         navBarWindowIsAlwaysVisible()
                         statusBarWindowIsAlwaysVisible()
-                        end {
+                        end("bothAppWindowsVisible") {
                             isVisible(primaryApp.defaultWindowName)
                                 .isVisible(secondaryApp.defaultWindowName)
                         }

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsRotateAndEnterAppPairsMode.kt

@@ -88,7 +88,7 @@ class RotateTwoLaunchedAppsRotateAndEnterAppPairsMode(
                     windowManagerTrace {
                         navBarWindowIsAlwaysVisible()
                         statusBarWindowIsAlwaysVisible()
-                        end {
+                        end("bothAppWindowsVisible") {
                             isVisible(primaryApp.defaultWindowName)
                             isVisible(secondaryApp.defaultWindowName)
                         }

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

@@ -116,7 +116,7 @@ class EnterLegacySplitScreenTest(
                     )
                 }
                 windowManagerTrace {
-                    end {
+                    end("appWindowIsVisible") {
                         isVisible(splitScreenApp.defaultWindowName)
                     }
                 }
@@ -151,7 +151,7 @@ class EnterLegacySplitScreenTest(
                     )
                 }
                 windowManagerTrace {
-                    end {
+                    end("appWindowIsVisible") {
                         isVisible(splitScreenApp.defaultWindowName)
                             .isVisible(secondaryApp.defaultWindowName)
                     }
@@ -187,7 +187,7 @@ class EnterLegacySplitScreenTest(
                     )
                 }
                 windowManagerTrace {
-                    end {
+                    end("appWindowIsVisible") {
                         isInvisible(nonResizeableApp.defaultWindowName)
                     }
                     visibleWindowsShownMoreThanOneConsecutiveEntry(

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitLegacySplitScreenTest.kt

@@ -104,7 +104,7 @@ class ExitLegacySplitScreenTest(
                 windowManagerTrace {
                     navBarWindowIsAlwaysVisible()
                     statusBarWindowIsAlwaysVisible()
-                    end {
+                    end("appWindowIsInvisible") {
                         isInvisible(splitScreenApp.defaultWindowName)
                     }
                 }
@@ -132,7 +132,7 @@ class ExitLegacySplitScreenTest(
                 windowManagerTrace {
                     navBarWindowIsAlwaysVisible()
                     statusBarWindowIsAlwaysVisible()
-                    end {
+                    end("appWindowIsVisible") {
                         isVisible(splitScreenApp.defaultWindowName)
                     }
                 }

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/NonResizableDismissInLegacySplitScreenTest.kt

@@ -72,7 +72,7 @@ class NonResizableDismissInLegacySplitScreenTest(
                     )
                 }
                 windowManagerTrace {
-                    end {
+                    end("nonResizeableAppWindowIsVisible") {
                         isVisible(nonResizeableApp.defaultWindowName)
                             .isInvisible(splitScreenApp.defaultWindowName)
                     }

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/NonResizableLaunchInLegacySplitScreenTest.kt

@@ -72,7 +72,7 @@ class NonResizableLaunchInLegacySplitScreenTest(
                     )
                 }
                 windowManagerTrace {
-                    end {
+                    end("nonResizeableAppWindowIsVisible") {
                         isVisible(nonResizeableApp.defaultWindowName)
                             .isInvisible(splitScreenApp.defaultWindowName)
                     }

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateOneLaunchedAppTest.kt

@@ -99,7 +99,7 @@ class RotateOneLaunchedAppTest(
                 windowManagerTrace {
                     navBarWindowIsAlwaysVisible()
                     statusBarWindowIsAlwaysVisible()
-                    end {
+                    end("appWindowIsVisible") {
                         isVisible(splitScreenApp.defaultWindowName)
                     }
                 }
@@ -131,7 +131,7 @@ class RotateOneLaunchedAppTest(
                 windowManagerTrace {
                     navBarWindowIsAlwaysVisible()
                     statusBarWindowIsAlwaysVisible()
-                    end {
+                    end("appWindowIsVisible") {
                         isVisible(splitScreenApp.defaultWindowName)
                     }
                 }

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateTwoLaunchedAppTest.kt

@@ -105,7 +105,7 @@ class RotateTwoLaunchedAppTest(
                 windowManagerTrace {
                     navBarWindowIsAlwaysVisible()
                     statusBarWindowIsAlwaysVisible()
-                    end {
+                    end("appWindowIsVisible") {
                         isVisible(splitScreenApp.defaultWindowName)
                             .isVisible(secondaryApp.defaultWindowName)
                     }
@@ -143,7 +143,7 @@ class RotateTwoLaunchedAppTest(
                 windowManagerTrace {
                     navBarWindowIsAlwaysVisible()
                     statusBarWindowIsAlwaysVisible()
-                    end {
+                    end("appWindowIsVisible") {
                         isVisible(splitScreenApp.defaultWindowName)
                                 .isVisible(secondaryApp.defaultWindowName)
                     }

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipKeyboardTest.kt

@@ -131,7 +131,7 @@ class PipKeyboardTest(
             }
             assertions {
                 windowManagerTrace {
-                    end {
+                    end("imeWindowAboveApp") {
                         isAboveWindow(IME_WINDOW_NAME, testApp.defaultWindowName)
                     }
                 }