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

Commit 67792341 authored Oct 17, 2022 by Matthew Small Committed by Android (Google) Code Review Oct 17, 2022

Merge "Adding new setting to communicate BTHM state to KeyGuard."

parents 1918e098 75688831

core/java/android/provider/Settings.java

+5 −0

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

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

+1 −1

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

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

+1 −0

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