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

Commit 91951d20 authored by Nataniel Borges's avatar Nataniel Borges Committed by Automerger Merge Worker
Browse files

Merge "Disable failing PIP expand assertion" into tm-dev am: 03465b1e am: 524c0913 

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



Change-Id: I6b79d2d729d1d33705b94f4c63dc9e1681844f1a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c801c99c 524c0913

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

+13 −1
Original line number Original line Diff line number Diff line
@@ -25,6 +25,8 @@ 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.Group3

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

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

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

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

import org.junit.Assume

import org.junit.FixMethodOrder

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runner.RunWith
@@ -81,9 +83,19 @@ class ExitPipViaIntentTest(testSpec: FlickerTestParameter) : ExitPipToAppTransit 
    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()





    /** {@inheritDoc}  */

    /** {@inheritDoc}  */

    @FlakyTest(bugId = 197726610)

    @Test

    override fun pipLayerExpands() {

        Assume.assumeFalse(isShellTransitionsEnabled)

        super.pipLayerExpands()

    }



    @Presubmit

    @Presubmit

    @Test

    @Test

    override fun pipLayerExpands() = super.pipLayerExpands()

    fun pipLayerExpands_ShellTransit() {

        Assume.assumeTrue(isShellTransitionsEnabled)

        super.pipLayerExpands()

    }





    companion object {

    companion object {

        /**

        /**