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

Commit f2d97c03 authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Revert^2 "Use shell command to clear overview" 

ce4a5773

Change-Id: I4dae70a187b44a9b8a8758173441ca89ca43cb8a
parent 1498fecf

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/EnterDesktopViaMenuOfLiveOverviewTask.kt

+2 −4
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.app.Instrumentation 
import android.tools.NavBar

import android.tools.PlatformConsts.DEFAULT_DISPLAY

import android.tools.Rotation

import android.tools.flicker.rules.RemoveAllTasksButHomeRule

import android.tools.traces.parsers.WindowManagerStateHelper

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.UiDevice
@@ -53,10 +54,7 @@ abstract class EnterDesktopViaMenuOfLiveOverviewTask : TestScenarioBase() { 
                .isDesktopModeSupportedOnDisplay(DEFAULT_DISPLAY)

        )

        // Clear all tasks

        val overview = tapl.goHome().switchToOverview()

        if (overview.hasTasks()) {

            overview.dismissAllTasks()

        }

        RemoveAllTasksButHomeRule.removeAllTasksButHome()

        mailApp.open()

    }

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/EnterDesktopViaMenuOfStaticOverviewTask.kt

+2 −4
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.app.Instrumentation 
import android.tools.NavBar

import android.tools.PlatformConsts.DEFAULT_DISPLAY

import android.tools.Rotation

import android.tools.flicker.rules.RemoveAllTasksButHomeRule

import android.tools.traces.parsers.WindowManagerStateHelper

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.UiDevice
@@ -55,10 +56,7 @@ abstract class EnterDesktopViaMenuOfStaticOverviewTask : TestScenarioBase() { 
                .isDesktopModeSupportedOnDisplay(DEFAULT_DISPLAY)

        )

        // Clear all tasks

        val overview = tapl.goHome().switchToOverview()

        if (overview.hasTasks()) {

            overview.dismissAllTasks()

        }

        RemoveAllTasksButHomeRule.removeAllTasksButHome()

        mailApp.open()

        tapl.goHome().switchToOverview()

    }

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/EnterDesktopViaStaticDesktopOverviewTask.kt

+2 −4
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.app.Instrumentation 
import android.tools.NavBar

import android.tools.PlatformConsts.DEFAULT_DISPLAY

import android.tools.Rotation

import android.tools.flicker.rules.RemoveAllTasksButHomeRule

import android.tools.traces.parsers.WindowManagerStateHelper

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.UiDevice
@@ -56,10 +57,7 @@ abstract class EnterDesktopViaStaticDesktopOverviewTask : TestScenarioBase() { 
                .isDesktopModeSupportedOnDisplay(DEFAULT_DISPLAY)

        )

        // Clear all tasks

        val overview = tapl.goHome().switchToOverview()

        if (overview.hasTasks()) {

            overview.dismissAllTasks()

        }

        RemoveAllTasksButHomeRule.removeAllTasksButHome()

        desktopApp.enterDesktopMode(wmHelper, device)

        tapl.goHome().switchToOverview()

    }

libs/WindowManager/Shell/tests/e2e/mediaprojection/scenarios/src/com/android/wm/shell/scenarios/StartAppMediaProjectionFromSplitScreen.kt

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.platform.test.annotations.Postsubmit 
import android.tools.NavBar

import android.tools.Rotation

import android.tools.device.apphelpers.CalculatorAppHelper

import android.tools.flicker.rules.RemoveAllTasksButHomeRule

import android.tools.traces.parsers.WindowManagerStateHelper

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.UiDevice
@@ -63,7 +64,7 @@ open class StartAppMediaProjectionFromSplitScreen { 


    @Before

    fun setup() {

        tapl.workspace.switchToOverview().dismissAllTasks()

        RemoveAllTasksButHomeRule.removeAllTasksButHome()



        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(initialRotation.value)

libs/WindowManager/Shell/tests/e2e/mediaprojection/scenarios/src/com/android/wm/shell/scenarios/StartAppMediaProjectionInSplitScreen.kt

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.platform.test.annotations.Postsubmit 
import android.tools.NavBar

import android.tools.Rotation

import android.tools.device.apphelpers.CalculatorAppHelper

import android.tools.flicker.rules.RemoveAllTasksButHomeRule

import android.tools.traces.parsers.WindowManagerStateHelper

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.UiDevice
@@ -60,7 +61,7 @@ open class StartAppMediaProjectionInSplitScreen { 


    @Before

    fun setup() {

        tapl.workspace.switchToOverview().dismissAllTasks()

        RemoveAllTasksButHomeRule.removeAllTasksButHome()

        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(initialRotation.value)

        SplitScreenUtils.enterSplit(wmHelper, tapl, device, targetApp, testApp, initialRotation)