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

Commit be2563f4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix wait condition for SetRequestedOrientationWhilePinnedTest" into tm-dev am: 68e3f55c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16999564

Change-Id: I3de4dde785635a9fff78c61dab7a950acc95f469
parents 14e10ed1 68e3f55c

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/SetRequestedOrientationWhilePinnedTest.kt

+11 −2
Original line number Original line Diff line number Diff line
@@ -25,8 +25,11 @@ import com.android.server.wm.flicker.FlickerTestParameter 
import com.android.server.wm.flicker.FlickerTestParameterFactory

import com.android.server.wm.flicker.FlickerTestParameterFactory

import com.android.server.wm.flicker.annotation.Group4

import com.android.server.wm.flicker.annotation.Group4

import com.android.server.wm.flicker.dsl.FlickerBuilder

import com.android.server.wm.flicker.dsl.FlickerBuilder

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

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

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

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

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

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

import com.android.server.wm.flicker.rules.RemoveAllTasksButHomeRule.Companion.removeAllTasksButHome

import com.android.wm.shell.flicker.pip.PipTransition.BroadcastActionTrigger.Companion.ORIENTATION_LANDSCAPE

import com.android.wm.shell.flicker.pip.PipTransition.BroadcastActionTrigger.Companion.ORIENTATION_LANDSCAPE

import com.android.wm.shell.flicker.testapp.Components

import com.android.wm.shell.flicker.testapp.Components

import com.android.wm.shell.flicker.testapp.Components.FixedActivity.EXTRA_FIXED_ORIENTATION

import com.android.wm.shell.flicker.testapp.Components.FixedActivity.EXTRA_FIXED_ORIENTATION
@@ -61,9 +64,11 @@ open class SetRequestedOrientationWhilePinnedTest( 




    override val transition: FlickerBuilder.() -> Unit

    override val transition: FlickerBuilder.() -> Unit

        get() = {

        get() = {

            setupAndTeardown(this)



            setup {

            setup {

                test {

                    removeAllTasksButHome()

                    device.wakeUpAndGoToHomeScreen()

                }

                eachRun {

                eachRun {

                    // Launch the PiP activity fixed as landscape.

                    // Launch the PiP activity fixed as landscape.

                    pipApp.launchViaIntent(wmHelper, stringExtras = mapOf(

                    pipApp.launchViaIntent(wmHelper, stringExtras = mapOf(
@@ -80,6 +85,10 @@ open class SetRequestedOrientationWhilePinnedTest( 
            teardown {

            teardown {

                eachRun {

                eachRun {

                    pipApp.exit(wmHelper)

                    pipApp.exit(wmHelper)

                    setRotation(Surface.ROTATION_0)

                }

                test {

                    removeAllTasksButHome()

                }

                }

            }

            }

            transitions {

            transitions {