Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enabling Monochromatic on droidfood" into tm-qpr-dev

Browse Source
This commit is contained in:
Lucas Dupin
2023-02-02 01:33:28 +00:00
committed by Android (Google) Code Review
parent 4514e31ec2 017b15d2a4
commit 18a164d8de
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/customization/src/com/android/systemui/shared/customization/data/content/CustomizationProviderContract.kt
View File

@@ -181,6 +181,9 @@ object CustomizationProviderContract {
/** Flag denoting whether the Wallpaper preview should use the full screen UI. */ /** Flag denoting whether the Wallpaper preview should use the full screen UI. */
const val FLAG_NAME_WALLPAPER_FULLSCREEN_PREVIEW = "wallpaper_fullscreen_preview" 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 { object Columns {
/** String. Unique ID for the flag. */ /** String. Unique ID for the flag. */
const val NAME = "name" const val NAME = "name"

4
packages/SystemUI/src/com/android/systemui/flags/Flags.kt
View File

@@ -312,9 +312,7 @@ object Flags {
val SCREEN_CONTENTS_TRANSLATION = unreleasedFlag(803, "screen_contents_translation") val SCREEN_CONTENTS_TRANSLATION = unreleasedFlag(803, "screen_contents_translation")
// 804 - monochromatic themes // 804 - monochromatic themes
@JvmField @JvmField val MONOCHROMATIC_THEME = unreleasedFlag(804, "monochromatic", teamfood = true)
val MONOCHROMATIC_THEMES =
sysPropBooleanFlag(804, "persist.sysui.monochromatic", default = false)
// 900 - media // 900 - media
// TODO(b/254512697): Tracking Bug // TODO(b/254512697): Tracking Bug

4
packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt
View File

@@ -367,6 +367,10 @@ constructor(
name = Contract.FlagsTable.FLAG_NAME_WALLPAPER_FULLSCREEN_PREVIEW, name = Contract.FlagsTable.FLAG_NAME_WALLPAPER_FULLSCREEN_PREVIEW,
value = featureFlags.isEnabled(Flags.WALLPAPER_FULLSCREEN_PREVIEW), value = featureFlags.isEnabled(Flags.WALLPAPER_FULLSCREEN_PREVIEW),
), ),
KeyguardPickerFlag(
name = Contract.FlagsTable.FLAG_NAME_MONOCHROMATIC_THEME,
value = featureFlags.isEnabled(Flags.MONOCHROMATIC_THEME)
)
) )
} }

2
packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
View File

@@ -374,7 +374,7 @@ public class ThemeOverlayController implements CoreStartable, Dumpable {
@Main Resources resources, @Main Resources resources,
WakefulnessLifecycle wakefulnessLifecycle) { WakefulnessLifecycle wakefulnessLifecycle) {
mContext = context; mContext = context;
mIsMonochromaticEnabled = featureFlags.isEnabled(Flags.MONOCHROMATIC_THEMES); mIsMonochromaticEnabled = featureFlags.isEnabled(Flags.MONOCHROMATIC_THEME);
mIsMonetEnabled = featureFlags.isEnabled(Flags.MONET); mIsMonetEnabled = featureFlags.isEnabled(Flags.MONET);
mDeviceProvisionedController = deviceProvisionedController; mDeviceProvisionedController = deviceProvisionedController;
mBroadcastDispatcher = broadcastDispatcher; mBroadcastDispatcher = broadcastDispatcher;