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

Commit 27d12ec8 authored Jan 10, 2022 by Yeabkal Wubshit

Add Settings Key for Wearable Bedtime Mode

Bug: 209670473
Change-Id: I9fc5f4ce10d9f4430dfeb16436be8facd13c1cb3
(cherry picked from commit 8c95dbd2dbc13370ab62eb2077d6109fe784c928)
(cherry picked from commit b3d39c5050ba4f99b259e375b6ece6077f4209f1)

parent 8fb12645

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(