diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt | 16 | ||||
| -rw-r--r-- | tests/FlickerTests/src/com/android/server/wm/flicker/launch/CommonAssertions.kt | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt index 059361525733..a540dffb3c9c 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt @@ -23,7 +23,7 @@ import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelpe import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper.Companion.STATUS_BAR_LAYER_NAME import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper.Companion.STATUS_BAR_WINDOW_NAME -val LAUNCHER_TITLE = arrayOf("Wallpaper", "Launcher", "com.google.android.googlequicksearchbox") +val HOME_WINDOW_TITLE = arrayOf("Wallpaper", "Launcher") fun FlickerTestParameter.statusBarWindowIsAlwaysVisible() { assertWm { @@ -41,23 +41,23 @@ fun FlickerTestParameter.launcherReplacesAppWindowAsTopWindow(testApp: IAppHelpe assertWm { this.showsAppWindowOnTop(testApp.getPackage()) .then() - .showsAppWindowOnTop(*LAUNCHER_TITLE) + .showsAppWindowOnTop(*HOME_WINDOW_TITLE) } } fun FlickerTestParameter.launcherWindowBecomesVisible() { assertWm { - this.hidesBelowAppWindow(*LAUNCHER_TITLE) + this.hidesBelowAppWindow(*HOME_WINDOW_TITLE) .then() - .showsBelowAppWindow(*LAUNCHER_TITLE) + .showsBelowAppWindow(*HOME_WINDOW_TITLE) } } fun FlickerTestParameter.launcherWindowBecomesInvisible() { assertWm { - this.showsBelowAppWindow(*LAUNCHER_TITLE) + this.showsBelowAppWindow(*HOME_WINDOW_TITLE) .then() - .hidesBelowAppWindow(*LAUNCHER_TITLE) + .hidesBelowAppWindow(*HOME_WINDOW_TITLE) } } @@ -179,7 +179,7 @@ fun FlickerTestParameter.statusBarLayerRotatesScales( fun FlickerTestParameter.appLayerReplacesLauncher(appName: String) { assertLayers { - this.isVisible(*LAUNCHER_TITLE) + this.isVisible(*HOME_WINDOW_TITLE) .then() .isVisible(appName) } @@ -190,7 +190,7 @@ fun FlickerTestParameter.launcherLayerReplacesApp(testApp: IAppHelper) { this.isVisible(testApp.getPackage()) .then() .isInvisible(testApp.getPackage()) - .isVisible(*LAUNCHER_TITLE) + .isVisible(*HOME_WINDOW_TITLE) } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/CommonAssertions.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/CommonAssertions.kt index 6a7309c4c120..01e34d9f8f97 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/CommonAssertions.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/CommonAssertions.kt @@ -18,11 +18,11 @@ package com.android.server.wm.flicker.launch import android.platform.helpers.IAppHelper import com.android.server.wm.flicker.FlickerTestParameter -import com.android.server.wm.flicker.LAUNCHER_TITLE +import com.android.server.wm.flicker.HOME_WINDOW_TITLE fun FlickerTestParameter.appWindowReplacesLauncherAsTopWindow(testApp: IAppHelper) { assertWm { - this.showsAppWindowOnTop(*LAUNCHER_TITLE) + this.showsAppWindowOnTop(*HOME_WINDOW_TITLE) .then() .showsAppWindowOnTop("Snapshot", testApp.getPackage()) } |