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 am: 18a164d8de

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21094388

Change-Id: Id96320275bdd35170c2a33dc59149b3ddce32bf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Lucas Dupin
2023-02-02 02:02:13 +00:00
committed by Automerger Merge Worker
parent 6b23032ee2 18a164d8de
commit ebb82ab7d8
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. */
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"

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")
// 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

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,
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,
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;