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

Commit bf9e0fe0 authored by Beth Thibodeau's avatar Beth Thibodeau
Browse files

Add media flag to required scene container flags 

Bug: 296122467
Test: atest SceneContainerFlagsTest
Flag: ACONFIG com.android.systemui.media_in_scene_container DEVELOPMENT
Change-Id: I0cbcd4feb84a321f238aca701132c4a7e81e0462
parent 2596f1e1

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(

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

+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)