From 57cde5c363b92b9d16c3b581f80412cf4fdccd38 Mon Sep 17 00:00:00 2001 From: Chilun Huang Date: Tue, 10 Jan 2023 17:41:49 +0800 Subject: [PATCH] Update flicker tests for new shell transition The shell transition is now consistent with the legacy one. So we don't need to take the divider bar as a reference. Update it to match the new transition. Bug: 258241450 Test: atest WMShellFlickerTests:DismissSplitScreenByDivider Change-Id: Ib5dbfe6d90e03efd6b3c0951fb87226272146496 --- .../flicker/splitscreen/DismissSplitScreenByDivider.kt | 8 -------- 1 file changed, 8 deletions(-) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/DismissSplitScreenByDivider.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/DismissSplitScreenByDivider.kt index d0f02e2bf5144..d3c68207bf978 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/DismissSplitScreenByDivider.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/DismissSplitScreenByDivider.kt @@ -26,7 +26,6 @@ import com.android.server.wm.flicker.FlickerTest import com.android.server.wm.flicker.FlickerTestFactory import com.android.server.wm.flicker.helpers.WindowUtils import com.android.server.wm.flicker.junit.FlickerParametersRunnerFactory -import com.android.wm.shell.flicker.SPLIT_SCREEN_DIVIDER_COMPONENT import com.android.wm.shell.flicker.appWindowBecomesInvisible import com.android.wm.shell.flicker.appWindowIsVisibleAtEnd import com.android.wm.shell.flicker.layerBecomesInvisible @@ -106,15 +105,8 @@ class DismissSplitScreenByDivider(flicker: FlickerTest) : SplitScreenBase(flicke fun secondaryAppBoundsIsFullscreenAtEnd() { flicker.assertLayers { this.isVisible(secondaryApp) - .isVisible(SPLIT_SCREEN_DIVIDER_COMPONENT) .then() .isInvisible(secondaryApp) - .isVisible(SPLIT_SCREEN_DIVIDER_COMPONENT) - .then() - .isVisible(secondaryApp, isOptional = true) - .isVisible(SPLIT_SCREEN_DIVIDER_COMPONENT, isOptional = true) - .then() - .contains(SPLIT_SCREEN_DIVIDER_COMPONENT) .then() .invoke("secondaryAppBoundsIsFullscreenAtEnd") { val displayBounds = WindowUtils.getDisplayBounds(flicker.scenario.endRotation)