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

Commit 83f256c6 authored by Ben Lin's avatar Ben Lin Committed by Automerger Merge Worker
Browse files

Merge "Disable PipLegacySplitScreenTest when Shell Transition is on." into sc-v2-dev am: 1b1cadef 

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

Change-Id: Ife08516253202013ed41de013e918dd8c64ff029
parents 348ed55e 1b1cadef

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

+9 −0
Original line number Diff line number Diff line
@@ -31,7 +31,10 @@ import com.android.wm.shell.flicker.helpers.ImeAppHelper 
import com.android.wm.shell.flicker.helpers.FixedAppHelper

import com.android.server.wm.flicker.repetitions

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

import com.android.wm.shell.flicker.helpers.BaseAppHelper.Companion.isShellTransitionsEnabled

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

import org.junit.Assume.assumeFalse

import org.junit.Before

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -51,6 +54,12 @@ class PipLegacySplitScreenTest(testSpec: FlickerTestParameter) : PipTransition(t 
    private val imeApp = ImeAppHelper(instrumentation)

    private val testApp = FixedAppHelper(instrumentation)



    @Before

    open fun setup() {

        // Legacy split is having some issue with Shell transition, and will be deprecated soon.

        assumeFalse(isShellTransitionsEnabled())

    }



    override val transition: FlickerBuilder.(Map<String, Any?>) -> Unit

        get() = {

            withTestName { testSpec.name }