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

Commit 82a488bf authored Dec 02, 2022 by Haik Kalantarian Committed by Android (Google) Code Review Dec 02, 2022

Merge "Added Global for RSB_WAKE_ENABLED"

parents e9fadf1e 39f4cc97

core/java/android/provider/Settings.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -17934,6 +17934,12 @@ public final class Settings {
		*/
		public static final String WET_MODE_ON = "wet_mode_on";

		/*
		* Whether the RSB wake feature is enabled.
		* @hide
		*/
		public static final String RSB_WAKE_ENABLED = "rsb_wake_enabled";

		/*
		* Whether the screen-unlock (keyguard) sound is enabled.
		* @hide

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -336,6 +336,7 @@ public class GlobalSettingsValidators {
		VALIDATORS.put(Global.Wearable.COOLDOWN_MODE_ON, BOOLEAN_VALIDATOR);
		VALIDATORS.put(
		Global.Wearable.GESTURE_TOUCH_AND_HOLD_WATCH_FACE_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.Wearable.RSB_WAKE_ENABLED, 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
		@@ -659,7 +659,8 @@ public class SettingsBackupTest {
		Settings.Global.Wearable.SCREEN_UNLOCK_SOUND_ENABLED,
		Settings.Global.Wearable.BEDTIME_MODE,
		Settings.Global.Wearable.BEDTIME_HARD_MODE,
		Settings.Global.Wearable.EARLY_UPDATES_STATUS);
		Settings.Global.Wearable.EARLY_UPDATES_STATUS,
		Settings.Global.Wearable.RSB_WAKE_ENABLED);

		private static final Set<String> BACKUP_DENY_LIST_SECURE_SETTINGS =
		newHashSet(