diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 9741d34a87be8..539ce71d62b3d 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -17410,6 +17410,12 @@ public final class Settings { */ public static final String TOUCH_AND_HOLD_WATCH_FACE = "touch_and_hold_watchface"; + /** + * Whether bedtime mode is enabled. + * @hide + */ + public static final String BEDTIME_MODE = "bedtime_mode"; + /** * Whether the current watchface is decomposable. * @hide diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java index 0584406ea8f7e..7f29c2c95e7ed 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java @@ -322,6 +322,7 @@ public class GlobalSettingsValidators { VALIDATORS.put(Global.Wearable.TOUCH_AND_HOLD_WATCH_FACE, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.Wearable.SCREEN_UNLOCK_SOUND_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.Wearable.CHARGING_SOUNDS_ENABLED, BOOLEAN_VALIDATOR); + VALIDATORS.put(Global.Wearable.BEDTIME_MODE, BOOLEAN_VALIDATOR); } } diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 031292e49ce7e..27fc97d56d7fe 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -655,7 +655,8 @@ public class SettingsBackupTest { Settings.Global.Wearable.WET_MODE_ON, Settings.Global.Wearable.COOLDOWN_MODE_ON, Settings.Global.Wearable.CHARGING_SOUNDS_ENABLED, - Settings.Global.Wearable.SCREEN_UNLOCK_SOUND_ENABLED); + Settings.Global.Wearable.SCREEN_UNLOCK_SOUND_ENABLED, + Settings.Global.Wearable.BEDTIME_MODE); private static final Set BACKUP_DENY_LIST_SECURE_SETTINGS = newHashSet(