diff options
4 files changed, 9 insertions, 4 deletions
diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/customization/data/content/CustomizationProviderContract.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/customization/data/content/CustomizationProviderContract.kt index e4e9c4648f14..c120876a7a63 100644 --- a/packages/SystemUI/customization/src/com/android/systemui/shared/customization/data/content/CustomizationProviderContract.kt +++ b/packages/SystemUI/customization/src/com/android/systemui/shared/customization/data/content/CustomizationProviderContract.kt @@ -181,6 +181,9 @@ object CustomizationProviderContract { /** Flag denoting whether the Wallpaper preview should use the full screen UI. */ const val FLAG_NAME_WALLPAPER_FULLSCREEN_PREVIEW = "wallpaper_fullscreen_preview" + /** Flag denoting whether the Monochromatic Theme is enabled. */ + const val FLAG_NAME_MONOCHROMATIC_THEME = "is_monochromatic_theme_enabled" + object Columns { /** String. Unique ID for the flag. */ const val NAME = "name" diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index 8bacf4e7cfaf..fc7c522b9ebb 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -312,9 +312,7 @@ object Flags { val SCREEN_CONTENTS_TRANSLATION = unreleasedFlag(803, "screen_contents_translation") // 804 - monochromatic themes - @JvmField - val MONOCHROMATIC_THEMES = - sysPropBooleanFlag(804, "persist.sysui.monochromatic", default = false) + @JvmField val MONOCHROMATIC_THEME = unreleasedFlag(804, "monochromatic", teamfood = true) // 900 - media // TODO(b/254512697): Tracking Bug diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt index 57c3b3143c62..b2da793bb8e0 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt @@ -367,6 +367,10 @@ constructor( name = Contract.FlagsTable.FLAG_NAME_WALLPAPER_FULLSCREEN_PREVIEW, value = featureFlags.isEnabled(Flags.WALLPAPER_FULLSCREEN_PREVIEW), ), + KeyguardPickerFlag( + name = Contract.FlagsTable.FLAG_NAME_MONOCHROMATIC_THEME, + value = featureFlags.isEnabled(Flags.MONOCHROMATIC_THEME) + ) ) } diff --git a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java index 3e3a891004c4..2b7ea2a01289 100644 --- a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java +++ b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java @@ -374,7 +374,7 @@ public class ThemeOverlayController implements CoreStartable, Dumpable { @Main Resources resources, WakefulnessLifecycle wakefulnessLifecycle) { mContext = context; - mIsMonochromaticEnabled = featureFlags.isEnabled(Flags.MONOCHROMATIC_THEMES); + mIsMonochromaticEnabled = featureFlags.isEnabled(Flags.MONOCHROMATIC_THEME); mIsMonetEnabled = featureFlags.isEnabled(Flags.MONET); mDeviceProvisionedController = deviceProvisionedController; mBroadcastDispatcher = broadcastDispatcher; |