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

Commit 5e1d3dd1 authored by Bill Lin's avatar Bill Lin Committed by Android (Google) Code Review
Browse files

Merge "2/ Clear all recents tasks before running legacysplitscreen tests"

parents 026102b5 21cfe8bb

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

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import com.android.server.wm.flicker.helpers.exitSplitScreen 
import com.android.server.wm.flicker.helpers.isInSplitScreen

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

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

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

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

import com.android.wm.shell.flicker.dockedStackDividerIsInvisible

import com.android.wm.shell.flicker.helpers.SplitScreenHelper.Companion.TEST_REPETITIONS
@@ -67,6 +68,7 @@ class EnterLegacySplitScreenTest( 
            setup {

                eachRun {

                    uiDevice.wakeUpAndGoToHomeScreen()

                    uiDevice.openQuickStepAndClearRecentAppsFromOverview()

                }

            }

            teardown {

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

+7 −5
Original line number Diff line number Diff line
@@ -30,8 +30,11 @@ import com.android.server.wm.flicker.dsl.FlickerBuilder 
import com.android.server.wm.flicker.dsl.runWithFlicker

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

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

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

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

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

import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible

import com.android.wm.shell.flicker.dockedStackDividerIsInvisible

import com.android.wm.shell.flicker.helpers.SplitScreenHelper.Companion.TEST_REPETITIONS

import org.junit.FixMethodOrder
@@ -61,10 +64,9 @@ class ExitLegacySplitScreenTest( 
            setup {

                eachRun {

                    uiDevice.wakeUpAndGoToHomeScreen()

                    secondaryApp.open()

                    uiDevice.pressHome()

                    splitScreenApp.open()

                    uiDevice.pressHome()

                    uiDevice.openQuickStepAndClearRecentAppsFromOverview()

                    secondaryApp.launchViaIntent()

                    splitScreenApp.launchViaIntent()

                    uiDevice.launchSplitScreen()

                }

            }

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/LegacySplitScreenToLauncherTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import com.android.server.wm.flicker.helpers.buildTestTag 
import com.android.server.wm.flicker.helpers.exitSplitScreen

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

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

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

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

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

import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible
@@ -82,6 +83,7 @@ class LegacySplitScreenToLauncherTest( 
                    setup {

                        test {

                            device.wakeUpAndGoToHomeScreen()

                            device.openQuickStepAndClearRecentAppsFromOverview()

                        }

                        eachRun {

                            testApp.open()

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/OpenAppToLegacySplitScreenTest.kt

+3 −1
Original line number Diff line number Diff line
@@ -24,13 +24,14 @@ import androidx.test.platform.app.InstrumentationRegistry 
import com.android.server.wm.flicker.Flicker

import com.android.server.wm.flicker.FlickerTestRunner

import com.android.server.wm.flicker.FlickerTestRunnerFactory

import com.android.server.wm.flicker.endRotation

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

import com.android.server.wm.flicker.endRotation

import com.android.server.wm.flicker.focusChanges

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

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

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

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

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

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

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

import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible
@@ -83,6 +84,7 @@ class OpenAppToLegacySplitScreenTest( 
                    setup {

                        test {

                            device.wakeUpAndGoToHomeScreen()

                            device.openQuickStepAndClearRecentAppsFromOverview()

                        }

                        eachRun {

                            testApp.open()

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

+5 −3
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import com.android.server.wm.flicker.dsl.runWithFlicker 
import com.android.server.wm.flicker.helpers.exitSplitScreen

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

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

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

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

import com.android.server.wm.flicker.navBarLayerRotatesAndScales

import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible
@@ -56,7 +57,8 @@ class RotateOneLaunchedAppTest( 
            }

            setup {

                test {

                    device.wakeUpAndGoToHomeScreen()

                    uiDevice.wakeUpAndGoToHomeScreen()

                    uiDevice.openQuickStepAndClearRecentAppsFromOverview()

                }

            }

            teardown {
@@ -81,7 +83,7 @@ class RotateOneLaunchedAppTest( 
            }

            transitions {

                splitScreenApp.launchViaIntent()

                device.launchSplitScreen()

                uiDevice.launchSplitScreen()

                setRotation(rotation)

            }

            assertions {
@@ -114,7 +116,7 @@ class RotateOneLaunchedAppTest( 
            transitions {

                splitScreenApp.launchViaIntent()

                setRotation(rotation)

                device.launchSplitScreen()

                uiDevice.launchSplitScreen()

            }

            assertions {

                layersTrace {