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

Commit 7d00847a authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Show Taskbar before accessing its icons" into main

parents e42c4e7c 08f42330

libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/splitscreen/scenarios/EnterSplitScreenByDragFromAllApps.kt

+4 −0
Original line number Diff line number Diff line
@@ -57,10 +57,13 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) { 


        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(rotation.value)



        tapl.enableBlockTimeout(true)

    }



    @Test

    open fun enterSplitScreenByDragFromAllApps() {

        tapl.showTaskbarIfHidden()

        tapl.launchedAppState.taskbar

            .openAllApps()

            .getAppIcon(secondaryApp.appName)
@@ -72,5 +75,6 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) { 
    fun teardown() {

        primaryApp.exit(wmHelper)

        secondaryApp.exit(wmHelper)

        tapl.enableBlockTimeout(false)

    }

}

libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/splitscreen/scenarios/EnterSplitScreenByDragFromShortcut.kt

+4 −0
Original line number Diff line number Diff line
@@ -59,10 +59,13 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) { 


        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(rotation.value)



        tapl.enableBlockTimeout(true)

    }



    @Test

    open fun enterSplitScreenByDragFromShortcut() {

        tapl.showTaskbarIfHidden()

        tapl.launchedAppState.taskbar

            .getAppIcon(secondaryApp.appName)

            .openDeepShortcutMenu()
@@ -83,6 +86,7 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) { 
    fun teardwon() {

        primaryApp.exit(wmHelper)

        secondaryApp.exit(wmHelper)

        tapl.enableBlockTimeout(false)

    }



    companion object {

libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/splitscreen/scenarios/EnterSplitScreenByDragFromTaskbar.kt

+4 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) { 
        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(rotation.value)



        tapl.enableBlockTimeout(true)



        tapl.goHome()

        SplitScreenUtils.createShortcutOnHotseatIfNotExist(tapl, secondaryApp.appName)

        primaryApp.launchViaIntent(wmHelper)
@@ -61,6 +63,7 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) { 


    @Test

    open fun enterSplitScreenByDragFromTaskbar() {

        tapl.showTaskbarIfHidden()

        tapl.launchedAppState.taskbar

            .getAppIcon(secondaryApp.appName)

            .dragToSplitscreen(secondaryApp.packageName, primaryApp.packageName)
@@ -71,6 +74,7 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) { 
    fun teardown() {

        primaryApp.exit(wmHelper)

        secondaryApp.exit(wmHelper)

        tapl.enableBlockTimeout(false)

    }



    companion object {

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

+8 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.tools.device.flicker.legacy.LegacyFlickerTest 
import android.tools.device.flicker.legacy.LegacyFlickerTestFactory

import androidx.test.filters.RequiresDevice

import com.android.wm.shell.flicker.utils.SplitScreenUtils

import org.junit.After

import org.junit.Assume

import org.junit.Before

import org.junit.FixMethodOrder
@@ -42,8 +43,10 @@ abstract class EnterSplitScreenByDragFromAllAppsBenchmark(override val flicker: 
            setup {

                tapl.goHome()

                primaryApp.launchViaIntent(wmHelper)

                tapl.enableBlockTimeout(true)

            }

            transitions {

                tapl.showTaskbarIfHidden()

                tapl.launchedAppState.taskbar

                    .openAllApps()

                    .getAppIcon(secondaryApp.appName)
@@ -57,6 +60,11 @@ abstract class EnterSplitScreenByDragFromAllAppsBenchmark(override val flicker: 
        Assume.assumeTrue(tapl.isTablet)

    }



    @After

    fun after() {

        tapl.enableBlockTimeout(false)

    }



    companion object {

        @Parameterized.Parameters(name = "{0}")

        @JvmStatic

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

+8 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.tools.device.flicker.legacy.LegacyFlickerTest 
import android.tools.device.flicker.legacy.LegacyFlickerTestFactory

import androidx.test.filters.RequiresDevice

import com.android.wm.shell.flicker.utils.SplitScreenUtils

import org.junit.After

import org.junit.Assume

import org.junit.Before

import org.junit.FixMethodOrder
@@ -42,13 +43,20 @@ abstract class EnterSplitScreenByDragFromShortcutBenchmark( 
        Assume.assumeTrue(tapl.isTablet)

    }



    @After

    fun after() {

        tapl.enableBlockTimeout(false)

    }



    protected val thisTransition: FlickerBuilder.() -> Unit = {

        setup {

            tapl.goHome()

            SplitScreenUtils.createShortcutOnHotseatIfNotExist(tapl, secondaryApp.appName)

            primaryApp.launchViaIntent(wmHelper)

            tapl.enableBlockTimeout(true)

        }

        transitions {

            tapl.showTaskbarIfHidden()

            tapl.launchedAppState.taskbar

                .getAppIcon(secondaryApp.appName)

                .openDeepShortcutMenu()