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

Commit ec2360f5 authored by Darrell Shi's avatar Darrell Shi Committed by Android (Google) Code Review
Browse files

Merge changes I9ddd1ac8,I0848708d into main 

* changes:
  Add COMMUNAL_HUB feature flag
  Rename flag to COMMUNAL_SERVICE_ENABLED
parents 3e920dd1 8471d5a2

packages/SystemUI/src/com/android/systemui/communal/data/repository/CommunalRepository.kt

+1 −1
Original line number Diff line number Diff line
@@ -17,5 +17,5 @@ class CommunalRepositoryImpl 
constructor(

    featureFlags: FeatureFlagsClassic,

) : CommunalRepository {

    override val isCommunalEnabled = featureFlags.isEnabled(Flags.COMMUNAL_HUB)

    override val isCommunalEnabled = featureFlags.isEnabled(Flags.COMMUNAL_SERVICE_ENABLED)

}

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+8 −2
Original line number Diff line number Diff line
@@ -817,7 +817,13 @@ object Flags { 
    val BLUETOOTH_QS_TILE_DIALOG = unreleasedFlag("bluetooth_qs_tile_dialog", teamfood = true)



    // TODO(b/300995746): Tracking Bug

    /** Enable communal hub features. */

    /** A resource flag for whether the communal service is enabled. */

    @JvmField

    val COMMUNAL_HUB = resourceBooleanFlag(R.bool.config_communalServiceEnabled, "communal_hub")

    val COMMUNAL_SERVICE_ENABLED = resourceBooleanFlag(R.bool.config_communalServiceEnabled,

        "communal_service_enabled")



    // TODO(b/303131306): Tracking Bug

    /** Whether communal hub features are enabled. */

    @JvmField

    val COMMUNAL_HUB = unreleasedFlag("communal_hub")

}