diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 84a61948775ce..4e15b38463d68 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -17600,6 +17600,11 @@ public final class Settings { */ public static final String BEDTIME_MODE = "bedtime_mode"; + /** + * Whether hard bedtime mode is active thus limiting user interactions. + */ + public static final String BEDTIME_HARD_MODE = "bedtime_hard_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 f0915f8be2870..9ef6d8fb358a1 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java @@ -336,6 +336,7 @@ public class GlobalSettingsValidators { 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); + VALIDATORS.put(Global.Wearable.BEDTIME_HARD_MODE, BOOLEAN_VALIDATOR); VALIDATORS.put( Global.Wearable.EARLY_UPDATES_STATUS, new DiscreteValueValidator( @@ -348,4 +349,3 @@ public class GlobalSettingsValidators { })); } } - diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 8f6924ced5826..9747a6c5ca708 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -657,6 +657,7 @@ public class SettingsBackupTest { Settings.Global.Wearable.CHARGING_SOUNDS_ENABLED, Settings.Global.Wearable.SCREEN_UNLOCK_SOUND_ENABLED, Settings.Global.Wearable.BEDTIME_MODE, + Settings.Global.Wearable.BEDTIME_HARD_MODE, Settings.Global.Wearable.EARLY_UPDATES_STATUS); private static final Set BACKUP_DENY_LIST_SECURE_SETTINGS =