From 4d20ded2e1a426f5d8259e7d42e8313ac8813f00 Mon Sep 17 00:00:00 2001 From: Andrew Zeng Date: Tue, 15 Nov 2022 18:27:07 -0800 Subject: [PATCH] Add global setting for Wear dynamic color themes Bug: 258552037 Test: atest SettingsProviderTest Change-Id: Ib3407701e16068243835913c63024cb0d25ec481 --- core/java/android/provider/Settings.java | 8 ++++++++ .../android/provider/settings/backup/GlobalSettings.java | 3 ++- .../settings/validators/GlobalSettingsValidators.java | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 03846dbcfb681..628b1402b07de 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -17995,6 +17995,14 @@ public final class Settings { * @hide */ public static final int EARLY_UPDATES_STATUS_ABORTED = 4; + + /** + * Whether dynamic color theming (e.g. Material You) is enabled for apps which support + * it. + * + * @hide + */ + public static final String DYNAMIC_COLOR_THEME_ENABLED = "dynamic_color_theme_enabled"; } } diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java index 28286817ea7e0..a9488a85a0b87 100644 --- a/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java +++ b/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java @@ -96,6 +96,7 @@ public class GlobalSettings { Settings.Global.Wearable.GESTURE_TOUCH_AND_HOLD_WATCH_FACE_ENABLED, Settings.Global.Wearable.BATTERY_SAVER_MODE, Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MS, - Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_SET_BY_USER + Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_SET_BY_USER, + Settings.Global.Wearable.DYNAMIC_COLOR_THEME_ENABLED, }; } diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java index 46876b457b549..a553c010b49d6 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java @@ -351,5 +351,6 @@ public class GlobalSettingsValidators { String.valueOf(Global.Wearable.EARLY_UPDATES_STATUS_SKIPPED), String.valueOf(Global.Wearable.EARLY_UPDATES_STATUS_ABORTED), })); + VALIDATORS.put(Global.Wearable.DYNAMIC_COLOR_THEME_ENABLED, BOOLEAN_VALIDATOR); } }