Merge "Add media flag to required scene container flags" into main (abb0e94f) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/scene/shared/flag/SceneContainerFlags.kt

+5 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ import com.android.systemui.flags.ReleasedFlag
		import com.android.systemui.flags.ResourceBooleanFlag
		import com.android.systemui.flags.UnreleasedFlag
		import com.android.systemui.keyguard.shared.KeyguardShadeMigrationNssl
		import com.android.systemui.media.controls.util.MediaInSceneContainerFlag
		import com.android.systemui.res.R
		import dagger.Module
		import dagger.Provides
		@@ -82,6 +83,10 @@ constructor(
		flagName = KeyguardShadeMigrationNssl.FLAG_NAME,
		flagValue = KeyguardShadeMigrationNssl.isEnabled,
		),
		AconfigFlagMustBeEnabled(
		flagName = MediaInSceneContainerFlag.FLAG_NAME,
		flagValue = MediaInSceneContainerFlag.isEnabled,
		),
		) +
		classicFlagTokens.map { flagToken -> FlagMustBeEnabled(flagToken) } +
		listOf(

+2 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import com.android.systemui.flags.ReleasedFlag
		import com.android.systemui.flags.ResourceBooleanFlag
		import com.android.systemui.flags.UnreleasedFlag
		import com.android.systemui.keyguard.shared.KeyguardShadeMigrationNssl
		import com.android.systemui.media.controls.util.MediaInSceneContainerFlag
		import com.android.systemui.res.R
		import com.google.common.truth.Truth.assertThat
		import org.junit.Before
		@@ -71,6 +72,7 @@ internal class SceneContainerFlagsTest(
		AconfigFlags.FLAG_SCENE_CONTAINER,
		AconfigFlags.FLAG_KEYGUARD_BOTTOM_AREA_REFACTOR,
		KeyguardShadeMigrationNssl.FLAG_NAME,
		MediaInSceneContainerFlag.FLAG_NAME,
		)
		.forEach { flagToken ->
		setFlagsRule.enableFlags(flagToken)