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

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

Browse Source
This commit is contained in:
Nataniel Borges
2021-01-29 19:46:12 +00:00
committed by Android (Google) Code Review
parent 8e79f01aba 0f3645b868
commit 3a544c9da5
12 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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"

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

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

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

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

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

@@ -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)
}

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

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

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

@@ -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(

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

@@ -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)
}
}

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

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

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

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

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

@@ -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)
}
}

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

@@ -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)
}

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

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