From aa207f2efdfddfc16cab93b6127f461b5c4e30ac Mon Sep 17 00:00:00 2001 From: Bill Lin Date: Tue, 2 Feb 2021 15:57:31 +0800 Subject: 3/ Add wmHelper to controll the state of test activity * launchSplitScreen(wmHelper) * reopenAppFromOverview(wmHelper) * openQuickstep(wmHelper) + waitForActivityDestroyed() Test: atest FlickerTests Test: atest WMShellFlickerTests Test: atest WindowManagerSmokeTest Bug: 179116910 Change-Id: Ic050a255ebfe5bbe657af7383e5bbe90ca0d56a8 --- .../wm/shell/flicker/helpers/SplitScreenHelper.kt | 12 -------- .../EnterSplitScreenDockActivity.kt | 2 +- .../EnterSplitScreenLaunchToSide.kt | 5 ++-- .../EnterSplitScreenNonResizableNotDock.kt | 11 ++++++-- .../ExitLegacySplitScreenFromBottom.kt | 12 +++++++- ...xitPrimarySplitScreenShowSecondaryFullscreen.kt | 14 ++++++++-- .../LegacySplitScreenToLauncher.kt | 5 ++-- .../LegacySplitScreenTransition.kt | 32 ++++++++++++++++------ .../NonResizableDismissInLegacySplitScreen.kt | 14 ++++++---- .../NonResizableLaunchInLegacySplitScreen.kt | 8 ++++-- .../OpenAppToLegacySplitScreen.kt | 2 +- .../legacysplitscreen/ResizeLegacySplitScreen.kt | 2 +- .../RotateOneLaunchedAppAndEnterSplitScreen.kt | 2 +- .../RotateOneLaunchedAppInSplitScreenMode.kt | 2 +- .../RotateTwoLaunchedAppAndEnterSplitScreen.kt | 5 ++-- .../RotateTwoLaunchedAppInSplitScreenMode.kt | 5 ++-- .../shell/flicker/pip/PipLegacySplitScreenTest.kt | 2 +- 17 files changed, 86 insertions(+), 49 deletions(-) (limited to 'libs') diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/helpers/SplitScreenHelper.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/helpers/SplitScreenHelper.kt index 9f2087fc91d6..901b7a393291 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/helpers/SplitScreenHelper.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/helpers/SplitScreenHelper.kt @@ -18,7 +18,6 @@ package com.android.wm.shell.flicker.helpers import android.app.Instrumentation import android.content.ComponentName -import android.os.SystemClock import com.android.wm.shell.flicker.testapp.Components class SplitScreenHelper( @@ -27,17 +26,6 @@ class SplitScreenHelper( componentsInfo: ComponentName ) : BaseAppHelper(instrumentation, activityLabel, componentsInfo) { - /** - * Reopens the first device window from the list of recent apps (overview) - */ - fun reopenAppFromOverview() { - val x = uiDevice.displayWidth / 2 - val y = uiDevice.displayHeight / 2 - uiDevice.click(x, y) - // Wait for animation to complete. - SystemClock.sleep(TIMEOUT_MS) - } - companion object { const val TEST_REPETITIONS = 1 const val TIMEOUT_MS = 3_000L diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenDockActivity.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenDockActivity.kt index 2c29220bf20e..0d9edd29d259 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenDockActivity.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenDockActivity.kt @@ -62,7 +62,7 @@ class EnterSplitScreenDockActivity( } repeat { SplitScreenHelper.TEST_REPETITIONS } transitions { - device.launchSplitScreen() + device.launchSplitScreen(wmHelper) } assertions { layersTrace { diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenLaunchToSide.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenLaunchToSide.kt index 903971ea084f..a513ee1e91f1 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenLaunchToSide.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenLaunchToSide.kt @@ -27,6 +27,7 @@ import com.android.server.wm.flicker.appWindowBecomesVisible import com.android.server.wm.flicker.dsl.FlickerBuilder import com.android.server.wm.flicker.helpers.buildTestTag import com.android.server.wm.flicker.helpers.launchSplitScreen +import com.android.server.wm.flicker.helpers.reopenAppFromOverview import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible import com.android.server.wm.flicker.startRotation import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible @@ -62,8 +63,8 @@ class EnterSplitScreenLaunchToSide( } repeat { SplitScreenHelper.TEST_REPETITIONS } transitions { - device.launchSplitScreen() - secondaryApp.reopenAppFromOverview() + device.launchSplitScreen(wmHelper) + device.reopenAppFromOverview(wmHelper) } assertions { layersTrace { diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenNonResizableNotDock.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenNonResizableNotDock.kt index e3619235ee77..78ed773f2409 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenNonResizableNotDock.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenNonResizableNotDock.kt @@ -60,10 +60,15 @@ class EnterSplitScreenNonResizableNotDock( buildTestTag("testLegacySplitScreenNonResizeableActivityNotDock", configuration) } repeat { SplitScreenHelper.TEST_REPETITIONS } + teardown { + eachRun { + nonResizeableApp.exit(wmHelper) + } + } transitions { nonResizeableApp.launchViaIntent(wmHelper) - device.openQuickstep() - if (device.canSplitScreen()) { + device.openQuickstep(wmHelper) + if (device.canSplitScreen(wmHelper)) { Assert.fail("Non-resizeable app should not enter split screen") } } @@ -93,7 +98,7 @@ class EnterSplitScreenNonResizableNotDock( } } return FlickerTestRunnerFactory.getInstance().buildTest( - instrumentation, defaultTransitionSetup, testSpec, + instrumentation, cleanSetup, testSpec, repetitions = SplitScreenHelper.TEST_REPETITIONS, supportedRotations = listOf(Surface.ROTATION_0 /* bugId = 178685668 */)) } diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitLegacySplitScreenFromBottom.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitLegacySplitScreenFromBottom.kt index 493366553623..f4e5ba7877da 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitLegacySplitScreenFromBottom.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitLegacySplitScreenFromBottom.kt @@ -60,8 +60,18 @@ class ExitLegacySplitScreenFromBottom( buildTestTag("testExitLegacySplitScreenFromBottom", configuration) } repeat { SplitScreenHelper.TEST_REPETITIONS } + setup { + eachRun { + splitScreenApp.launchViaIntent(wmHelper) + device.launchSplitScreen(wmHelper) + } + } + teardown { + eachRun { + splitScreenApp.exit(wmHelper) + } + } transitions { - device.launchSplitScreen() device.exitSplitScreenFromBottom() } assertions { diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitPrimarySplitScreenShowSecondaryFullscreen.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitPrimarySplitScreenShowSecondaryFullscreen.kt index ff3a979717f2..8737fc5f8430 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitPrimarySplitScreenShowSecondaryFullscreen.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitPrimarySplitScreenShowSecondaryFullscreen.kt @@ -26,6 +26,7 @@ import com.android.server.wm.flicker.appWindowBecomesInVisible import com.android.server.wm.flicker.dsl.FlickerBuilder import com.android.server.wm.flicker.helpers.buildTestTag import com.android.server.wm.flicker.helpers.launchSplitScreen +import com.android.server.wm.flicker.helpers.reopenAppFromOverview import com.android.server.wm.flicker.layerBecomesInvisible import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible @@ -58,11 +59,18 @@ class ExitPrimarySplitScreenShowSecondaryFullscreen( buildTestTag("testExitPrimarySplitScreenShowSecondaryFullscreen", configuration) } repeat { SplitScreenHelper.TEST_REPETITIONS } + teardown { + eachRun { + secondaryApp.exit(wmHelper) + } + } transitions { - device.launchSplitScreen() - secondaryApp.reopenAppFromOverview() + splitScreenApp.launchViaIntent(wmHelper) + secondaryApp.launchViaIntent(wmHelper) + device.launchSplitScreen(wmHelper) + device.reopenAppFromOverview(wmHelper) // TODO(b/175687842) Can not find Split screen divider, use exit() instead - splitScreenApp.exit() + splitScreenApp.exit(wmHelper) } assertions { layersTrace { diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/LegacySplitScreenToLauncher.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/LegacySplitScreenToLauncher.kt index 03b6edf0ff2a..c0feaee73d9a 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/LegacySplitScreenToLauncher.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/LegacySplitScreenToLauncher.kt @@ -80,13 +80,12 @@ class LegacySplitScreenToLauncher( setup { test { device.wakeUpAndGoToHomeScreen() - device.openQuickStepAndClearRecentAppsFromOverview() + device.openQuickStepAndClearRecentAppsFromOverview(wmHelper) } eachRun { testApp.launchViaIntent(wmHelper) this.setRotation(configuration.endRotation) - device.launchSplitScreen() - device.waitForIdle() + device.launchSplitScreen(wmHelper) } } teardown { diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/LegacySplitScreenTransition.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/LegacySplitScreenTransition.kt index 328ff88cd41b..f9d2f49186a7 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/LegacySplitScreenTransition.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/LegacySplitScreenTransition.kt @@ -21,7 +21,10 @@ import android.os.Bundle import android.support.test.launcherhelper.LauncherStrategyFactory import android.view.Surface import com.android.server.wm.flicker.dsl.FlickerBuilder +import com.android.server.wm.flicker.helpers.exitSplitScreen +import com.android.server.wm.flicker.helpers.isInSplitScreen import com.android.server.wm.flicker.helpers.openQuickStepAndClearRecentAppsFromOverview +import com.android.server.wm.flicker.helpers.openQuickstep import com.android.server.wm.flicker.helpers.setRotation import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen import com.android.server.wm.flicker.startRotation @@ -46,7 +49,7 @@ abstract class LegacySplitScreenTransition( setup { eachRun { device.wakeUpAndGoToHomeScreen() - device.openQuickStepAndClearRecentAppsFromOverview() + device.openQuickStepAndClearRecentAppsFromOverview(wmHelper) secondaryApp.launchViaIntent(wmHelper) splitScreenApp.launchViaIntent(wmHelper) this.setRotation(configuration.startRotation) @@ -54,8 +57,12 @@ abstract class LegacySplitScreenTransition( } teardown { eachRun { - splitScreenApp.exit() - secondaryApp.exit() + // TODO(b/175687842) Workaround for exit legacy split screen + device.openQuickstep(wmHelper) + if (device.isInSplitScreen()) { + device.exitSplitScreen() + } + device.pressHome() this.setRotation(Surface.ROTATION_0) } } @@ -66,13 +73,18 @@ abstract class LegacySplitScreenTransition( setup { eachRun { device.wakeUpAndGoToHomeScreen() - device.openQuickStepAndClearRecentAppsFromOverview() + device.openQuickStepAndClearRecentAppsFromOverview(wmHelper) this.setRotation(configuration.startRotation) } } teardown { eachRun { - nonResizeableApp.exit() + // TODO(b/175687842) Workaround for exit legacy split screen + device.openQuickstep(wmHelper) + if (device.isInSplitScreen()) { + device.exitSplitScreen() + } + device.pressHome() this.setRotation(Surface.ROTATION_0) } } @@ -83,15 +95,19 @@ abstract class LegacySplitScreenTransition( setup { eachRun { device.wakeUpAndGoToHomeScreen() - device.openQuickStepAndClearRecentAppsFromOverview() + device.openQuickStepAndClearRecentAppsFromOverview(wmHelper) secondaryApp.launchViaIntent(wmHelper) splitScreenApp.launchViaIntent(wmHelper) } } teardown { eachRun { - splitScreenApp.exit() - secondaryApp.exit() + // TODO(b/175687842) Workaround for exit legacy split screen + device.openQuickstep(wmHelper) + if (device.isInSplitScreen()) { + device.exitSplitScreen() + } + device.pressHome() this.setRotation(Surface.ROTATION_0) } } diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/NonResizableDismissInLegacySplitScreen.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/NonResizableDismissInLegacySplitScreen.kt index f2a7cda3b42d..a8de8db719a8 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/NonResizableDismissInLegacySplitScreen.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/NonResizableDismissInLegacySplitScreen.kt @@ -29,6 +29,7 @@ import com.android.server.wm.flicker.appWindowBecomesVisible import com.android.server.wm.flicker.dsl.FlickerBuilder import com.android.server.wm.flicker.helpers.buildTestTag import com.android.server.wm.flicker.helpers.launchSplitScreen +import com.android.server.wm.flicker.helpers.reopenAppFromOverview import com.android.server.wm.flicker.layerBecomesInvisible import com.android.server.wm.flicker.layerBecomesVisible import com.android.server.wm.flicker.visibleLayersShownMoreThanOneConsecutiveEntry @@ -60,12 +61,15 @@ class NonResizableDismissInLegacySplitScreen( buildTestTag("testNonResizableDismissInLegacySplitScreen", configuration) } repeat { SplitScreenHelper.TEST_REPETITIONS } + setup { + eachRun { + nonResizeableApp.launchViaIntent(wmHelper) + splitScreenApp.launchViaIntent(wmHelper) + device.launchSplitScreen(wmHelper) + } + } transitions { - nonResizeableApp.launchViaIntent(wmHelper) - splitScreenApp.launchViaIntent(wmHelper) - device.launchSplitScreen() - nonResizeableApp.reopenAppFromOverview() - wmHelper.waitForAppTransitionIdle() + device.reopenAppFromOverview(wmHelper) } assertions { layersTrace { diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/NonResizableLaunchInLegacySplitScreen.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/NonResizableLaunchInLegacySplitScreen.kt index 421ecffc97d8..c82c80237912 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/NonResizableLaunchInLegacySplitScreen.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/NonResizableLaunchInLegacySplitScreen.kt @@ -60,9 +60,13 @@ class NonResizableLaunchInLegacySplitScreen( buildTestTag("testNonResizableLaunchInLegacySplitScreen", configuration) } repeat { SplitScreenHelper.TEST_REPETITIONS } + setup { + eachRun { + splitScreenApp.launchViaIntent(wmHelper) + device.launchSplitScreen(wmHelper) + } + } transitions { - splitScreenApp.launchViaIntent(wmHelper) - device.launchSplitScreen() nonResizeableApp.launchViaIntent(wmHelper) wmHelper.waitForAppTransitionIdle() } diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/OpenAppToLegacySplitScreen.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/OpenAppToLegacySplitScreen.kt index 7edef9314941..9199c39535ac 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/OpenAppToLegacySplitScreen.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/OpenAppToLegacySplitScreen.kt @@ -64,7 +64,7 @@ class OpenAppToLegacySplitScreen( } repeat { SplitScreenHelper.TEST_REPETITIONS } transitions { - device.launchSplitScreen() + device.launchSplitScreen(wmHelper) wmHelper.waitForAppTransitionIdle() } assertions { diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ResizeLegacySplitScreen.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ResizeLegacySplitScreen.kt index 54a37d71868d..c305bd856f58 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ResizeLegacySplitScreen.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ResizeLegacySplitScreen.kt @@ -100,7 +100,7 @@ class ResizeLegacySplitScreen( device.pressHome() testAppTop.launchViaIntent(wmHelper) device.waitForIdle() - device.launchSplitScreen() + device.launchSplitScreen(wmHelper) val snapshot = device.findObject(By.res(device.launcherPackageName, "snapshot")) snapshot.click() diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateOneLaunchedAppAndEnterSplitScreen.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateOneLaunchedAppAndEnterSplitScreen.kt index 214269e13203..40bdaf3df5e8 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateOneLaunchedAppAndEnterSplitScreen.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateOneLaunchedAppAndEnterSplitScreen.kt @@ -63,7 +63,7 @@ class RotateOneLaunchedAppAndEnterSplitScreen( } repeat { SplitScreenHelper.TEST_REPETITIONS } transitions { - device.launchSplitScreen() + device.launchSplitScreen(wmHelper) this.setRotation(configuration.startRotation) } assertions { diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateOneLaunchedAppInSplitScreenMode.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateOneLaunchedAppInSplitScreenMode.kt index 4290c923b38d..ae2c2d8f1bf2 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateOneLaunchedAppInSplitScreenMode.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateOneLaunchedAppInSplitScreenMode.kt @@ -64,7 +64,7 @@ class RotateOneLaunchedAppInSplitScreenMode( repeat { SplitScreenHelper.TEST_REPETITIONS } transitions { this.setRotation(configuration.startRotation) - device.launchSplitScreen() + device.launchSplitScreen(wmHelper) } assertions { layersTrace { diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateTwoLaunchedAppAndEnterSplitScreen.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateTwoLaunchedAppAndEnterSplitScreen.kt index 4095b9a2e61e..aa9ac8f9782f 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateTwoLaunchedAppAndEnterSplitScreen.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateTwoLaunchedAppAndEnterSplitScreen.kt @@ -28,6 +28,7 @@ import com.android.server.wm.flicker.dsl.FlickerBuilder import com.android.server.wm.flicker.endRotation import com.android.server.wm.flicker.helpers.buildTestTag import com.android.server.wm.flicker.helpers.launchSplitScreen +import com.android.server.wm.flicker.helpers.reopenAppFromOverview import com.android.server.wm.flicker.helpers.setRotation import com.android.server.wm.flicker.navBarLayerRotatesAndScales import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible @@ -65,8 +66,8 @@ class RotateTwoLaunchedAppAndEnterSplitScreen( repeat { SplitScreenHelper.TEST_REPETITIONS } transitions { this.setRotation(configuration.startRotation) - device.launchSplitScreen() - secondaryApp.reopenAppFromOverview() + device.launchSplitScreen(wmHelper) + device.reopenAppFromOverview(wmHelper) } assertions { layersTrace { diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateTwoLaunchedAppInSplitScreenMode.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateTwoLaunchedAppInSplitScreenMode.kt index aebf6067615e..0e864dbbb75d 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateTwoLaunchedAppInSplitScreenMode.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateTwoLaunchedAppInSplitScreenMode.kt @@ -28,6 +28,7 @@ import com.android.server.wm.flicker.dsl.FlickerBuilder import com.android.server.wm.flicker.endRotation import com.android.server.wm.flicker.helpers.buildTestTag import com.android.server.wm.flicker.helpers.launchSplitScreen +import com.android.server.wm.flicker.helpers.reopenAppFromOverview import com.android.server.wm.flicker.helpers.setRotation import com.android.server.wm.flicker.navBarLayerRotatesAndScales import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible @@ -65,8 +66,8 @@ class RotateTwoLaunchedAppInSplitScreenMode( repeat { SplitScreenHelper.TEST_REPETITIONS } setup { eachRun { - device.launchSplitScreen() - splitScreenApp.reopenAppFromOverview() + device.launchSplitScreen(wmHelper) + device.reopenAppFromOverview(wmHelper) this.setRotation(configuration.startRotation) } } diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipLegacySplitScreenTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipLegacySplitScreenTest.kt index f10bd7f1e45a..5a1e5a1fe7c5 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipLegacySplitScreenTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipLegacySplitScreenTest.kt @@ -71,7 +71,7 @@ class PipLegacySplitScreenTest( } transitions { testApp.launchViaIntent() - device.launchSplitScreen() + device.launchSplitScreen(wmHelper) imeApp.launchViaIntent() waitForAnimationComplete() } -- cgit v1.2.3-59-g8ed1b