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

Commit eb5bb034 authored by Liana Kazanova (xWF)'s avatar Liana Kazanova (xWF) Committed by Android (Google) Code Review
Browse files

Merge "Revert "Use shell command to clear overview"" into main

parents 4f946451 ce4a5773

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

+4 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.wm.shell.scenarios 
import android.app.Instrumentation

import android.tools.NavBar

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
@@ -49,7 +48,10 @@ abstract class EnterDesktopViaMenuOfLiveOverviewTask : TestScenarioBase() { 
    fun setup() {

        Assume.assumeTrue(Flags.enableDesktopWindowingMode() && tapl.isTablet)

        // Clear all tasks

        RemoveAllTasksButHomeRule.removeAllTasksButHome()

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

        if (overview.hasTasks()) {

            overview.dismissAllTasks()

        }

        mailApp.open()

    }

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

+4 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.wm.shell.scenarios 
import android.app.Instrumentation

import android.tools.NavBar

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
@@ -51,7 +50,10 @@ abstract class EnterDesktopViaMenuOfStaticOverviewTask : TestScenarioBase() { 
    fun setup() {

        Assume.assumeTrue(Flags.enableDesktopWindowingMode() && tapl.isTablet)

        // Clear all tasks

        RemoveAllTasksButHomeRule.removeAllTasksButHome()

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

        if (overview.hasTasks()) {

            overview.dismissAllTasks()

        }

        mailApp.open()

        tapl.goHome().switchToOverview()

    }

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

+4 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.wm.shell.scenarios 
import android.app.Instrumentation

import android.tools.NavBar

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
@@ -52,7 +51,10 @@ abstract class EnterDesktopViaStaticDesktopOverviewTask : TestScenarioBase() { 
    fun setup() {

        Assume.assumeTrue(Flags.enableDesktopWindowingMode() && tapl.isTablet)

        // Clear all tasks

        RemoveAllTasksButHomeRule.removeAllTasksButHome()

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

        if (overview.hasTasks()) {

            overview.dismissAllTasks()

        }

        desktopApp.enterDesktopMode(wmHelper, device)

        tapl.goHome().switchToOverview()

    }

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

+1 −2
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 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
@@ -64,7 +63,7 @@ open class StartAppMediaProjectionFromSplitScreen { 


    @Before

    fun setup() {

        RemoveAllTasksButHomeRule.removeAllTasksButHome()

        tapl.workspace.switchToOverview().dismissAllTasks()



        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(initialRotation.value)

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

+1 −2
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 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
@@ -61,7 +60,7 @@ open class StartAppMediaProjectionInSplitScreen { 


    @Before

    fun setup() {

        RemoveAllTasksButHomeRule.removeAllTasksButHome()

        tapl.workspace.switchToOverview().dismissAllTasks()

        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(initialRotation.value)

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