Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96753d9f authored by Chilun Huang's avatar Chilun Huang Committed by Android (Google) Code Review
Browse files

Merge "Update flicker tests for new shell transition"

parents ab14e55a 57cde5c3

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/DismissSplitScreenByDivider.kt

+0 −8
Original line number Original line Diff line number Diff line
@@ -26,7 +26,6 @@ import com.android.server.wm.flicker.FlickerTest 
import com.android.server.wm.flicker.FlickerTestFactory

import com.android.server.wm.flicker.FlickerTestFactory

import com.android.server.wm.flicker.helpers.WindowUtils

import com.android.server.wm.flicker.helpers.WindowUtils

import com.android.server.wm.flicker.junit.FlickerParametersRunnerFactory

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.appWindowBecomesInvisible

import com.android.wm.shell.flicker.appWindowIsVisibleAtEnd

import com.android.wm.shell.flicker.appWindowIsVisibleAtEnd

import com.android.wm.shell.flicker.layerBecomesInvisible

import com.android.wm.shell.flicker.layerBecomesInvisible
@@ -106,15 +105,8 @@ class DismissSplitScreenByDivider(flicker: FlickerTest) : SplitScreenBase(flicke 
    fun secondaryAppBoundsIsFullscreenAtEnd() {

    fun secondaryAppBoundsIsFullscreenAtEnd() {

        flicker.assertLayers {

        flicker.assertLayers {

            this.isVisible(secondaryApp)

            this.isVisible(secondaryApp)

                .isVisible(SPLIT_SCREEN_DIVIDER_COMPONENT)

                .then()

                .then()

                .isInvisible(secondaryApp)

                .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()

                .then()

                .invoke("secondaryAppBoundsIsFullscreenAtEnd") {

                .invoke("secondaryAppBoundsIsFullscreenAtEnd") {

                    val displayBounds = WindowUtils.getDisplayBounds(flicker.scenario.endRotation)

                    val displayBounds = WindowUtils.getDisplayBounds(flicker.scenario.endRotation)