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

Commit 8caa1ad4 authored by Ikram Gabiyev's avatar Ikram Gabiyev
Browse files

Require PiP2 flag off for dismiss split test 

Overall the tests are flaky and have been failing
before the enable_pip2 flag rollout to staging.
But it looks like the [ROTATION_90_GESTURAL_NAV] config in particular enters PiP
when exiting splitscreen with the primary app,
which means this is hitting the DefaultMixedHandler + PiP2 path
which we have been planning on refining after trunkfood-partial.

So require enable_pip2 flag to be disabled to run
DismissSplitScreenByGoHome flicker test

Bug: 380036543
Flag: com.android.wm.shell.enable_pip2
Test: atest DismissSplitScreenByGoHome
Change-Id: I6c60ee0c8bd607989aff31fed4b12aca0c76aa08
parent 0508c7f4

libs/WindowManager/Shell/tests/e2e/splitscreen/flicker-legacy/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ java_library { 
        "wm-flicker-common-assertions",

        "launcher-helper-lib",

        "launcher-aosp-tapl",

        "com_android_wm_shell_flags_lib",

    ],

}

libs/WindowManager/Shell/tests/e2e/splitscreen/flicker-legacy/src/com/android/wm/shell/flicker/splitscreen/DismissSplitScreenByGoHome.kt

+10 −0
Original line number Diff line number Diff line
@@ -17,12 +17,16 @@ 
package com.android.wm.shell.flicker.splitscreen



import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.RequiresFlagsDisabled

import android.platform.test.flag.junit.CheckFlagsRule

import android.platform.test.flag.junit.DeviceFlagsValueProvider

import android.tools.flicker.junit.FlickerParametersRunnerFactory

import android.tools.flicker.legacy.FlickerBuilder

import android.tools.flicker.legacy.LegacyFlickerTest

import android.tools.flicker.legacy.LegacyFlickerTestFactory

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

import com.android.wm.shell.Flags

import com.android.wm.shell.flicker.splitscreen.benchmark.DismissSplitScreenByGoHomeBenchmark

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

import com.android.wm.shell.flicker.utils.appWindowBecomesInvisible
@@ -30,6 +34,7 @@ import com.android.wm.shell.flicker.utils.layerBecomesInvisible 
import com.android.wm.shell.flicker.utils.splitAppLayerBoundsBecomesInvisible

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

import org.junit.FixMethodOrder

import org.junit.Rule

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters
@@ -44,8 +49,13 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@RequiresFlagsDisabled(Flags.FLAG_ENABLE_PIP2)

class DismissSplitScreenByGoHome(override val flicker: LegacyFlickerTest) :

    DismissSplitScreenByGoHomeBenchmark(flicker), ICommonAssertions {

    @JvmField

    @Rule

    val checkFlagsRule: CheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule()



    override val transition: FlickerBuilder.() -> Unit

        get() = {

            defaultSetup(this)