Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 339771ab authored May 19, 2022 by Yeabkal Wubshit Committed by Android (Google) Code Review May 19, 2022

Merge "Add Settings Key for Wearable Bedtime Mode"

parents 6d929fba 27d12ec8

core/java/android/provider/Settings.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -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

packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}

packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -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<String> BACKUP_DENY_LIST_SECURE_SETTINGS =
		newHashSet(