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

Commit e95a4353 authored by Charles Chen's avatar Charles Chen Committed by Android (Google) Code Review
Browse files

Merge "Remove better_support_non_match_parent_activity" into main

parents 896dd599 66564d26

core/java/android/window/flags/windowing_sdk.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -75,13 +75,6 @@ flag { 
    }

}



flag {

    namespace: "windowing_sdk"

    name: "better_support_non_match_parent_activity"

    description: "Relax the assumption of non-match parent activity"

    bug: "356277166"

}



flag {

    namespace: "aaos_core_contrib"

    name: "safe_region_letterboxing"

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

+0 −3
Original line number Diff line number Diff line
@@ -20,12 +20,10 @@ import android.platform.test.annotations.Postsubmit 
import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.RequiresDevice

import android.platform.test.annotations.RequiresFlagsDisabled

import android.platform.test.annotations.RequiresFlagsEnabled

import android.tools.flicker.junit.FlickerParametersRunnerFactory

import android.tools.flicker.legacy.FlickerBuilder

import android.tools.flicker.legacy.LegacyFlickerTest

import androidx.test.filters.FlakyTest

import com.android.window.flags.Flags

import com.android.wm.shell.flicker.pip.common.widthNotSmallerThan

import org.junit.Assume

import org.junit.FixMethodOrder
@@ -59,7 +57,6 @@ import org.junit.runners.Parameterized 
 */

// TODO(b/380796448): re-enable tests after the support of non-match parent PIP animation for PIP2.

@RequiresFlagsDisabled(com.android.wm.shell.Flags.FLAG_ENABLE_PIP2)

@RequiresFlagsEnabled(Flags.FLAG_BETTER_SUPPORT_NON_MATCH_PARENT_ACTIVITY)

@RequiresDevice

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

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

+0 −3
Original line number Diff line number Diff line
@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.pip.nonmatchparent 
import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.RequiresDevice

import android.platform.test.annotations.RequiresFlagsDisabled

import android.platform.test.annotations.RequiresFlagsEnabled

import android.tools.flicker.junit.FlickerParametersRunnerFactory

import android.tools.flicker.legacy.FlickerBuilder

import android.tools.flicker.legacy.LegacyFlickerTest

import com.android.window.flags.Flags

import org.junit.Assume

import org.junit.FixMethodOrder

import org.junit.Test
@@ -55,7 +53,6 @@ import org.junit.runners.Parameterized 
 */

// TODO(b/380796448): re-enable tests after the support of non-match parent PIP animation for PIP2.

@RequiresFlagsDisabled(com.android.wm.shell.Flags.FLAG_ENABLE_PIP2)

@RequiresFlagsEnabled(Flags.FLAG_BETTER_SUPPORT_NON_MATCH_PARENT_ACTIVITY)

@RequiresDevice

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

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

+0 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.wm.shell.flicker.pip.nonmatchparent 


import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.RequiresFlagsDisabled

import android.platform.test.annotations.RequiresFlagsEnabled

import android.tools.flicker.junit.FlickerParametersRunnerFactory

import android.tools.flicker.legacy.LegacyFlickerTest

import android.tools.traces.component.ComponentNameMatcher
@@ -57,7 +56,6 @@ import org.junit.runners.Parameterized 
 */

// TODO(b/380796448): re-enable tests after the support of non-match parent PIP animation for PIP2.

@RequiresFlagsDisabled(Flags.FLAG_ENABLE_PIP2)

@RequiresFlagsEnabled(com.android.window.flags.Flags.FLAG_BETTER_SUPPORT_NON_MATCH_PARENT_ACTIVITY)

@RequiresDevice

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

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

+0 −3
Original line number Diff line number Diff line
@@ -19,13 +19,11 @@ package com.android.wm.shell.flicker.pip.nonmatchparent 
import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.RequiresDevice

import android.platform.test.annotations.RequiresFlagsDisabled

import android.platform.test.annotations.RequiresFlagsEnabled

import android.tools.flicker.junit.FlickerParametersRunnerFactory

import android.tools.flicker.legacy.FlickerBuilder

import android.tools.flicker.legacy.LegacyFlickerTest

import android.tools.traces.parsers.toFlickerComponent

import com.android.server.wm.flicker.testapp.ActivityOptions.BottomHalfPip.LAUNCHING_APP_COMPONENT

import com.android.window.flags.Flags

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -56,7 +54,6 @@ import org.junit.runners.Parameterized 
 */

// TODO(b/380796448): re-enable tests after the support of non-match parent PIP animation for PIP2.

@RequiresFlagsDisabled(com.android.wm.shell.Flags.FLAG_ENABLE_PIP2)

@RequiresFlagsEnabled(Flags.FLAG_BETTER_SUPPORT_NON_MATCH_PARENT_ACTIVITY)

@RequiresDevice

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)