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

Commit bebf0e02 authored May 31, 2024 by Jacob Hobbie Committed by Android (Google) Code Review May 31, 2024

Merge "Adding sound/haptic settings." into main

parents 07d8de08 21b7a74a

core/java/android/provider/Settings.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -19929,6 +19929,12 @@ public final class Settings {
		*/
		public static final String NETWORK_LOCATION_OPT_IN = "network_location_opt_in";

		/**
		* Whether haptics are enabled for Active Unlock on wear.
		* @hide
		*/
		public static final String VIBRATE_FOR_ACTIVE_UNLOCK = "wear_vibrate_for_active_unlock";

		/**
		* The custom foreground color.
		* @hide

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -418,6 +418,7 @@ public class GlobalSettingsValidators {
		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.VIBRATE_FOR_ACTIVE_UNLOCK, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.Wearable.DYNAMIC_COLOR_THEME_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.Wearable.SCREENSHOT_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.Wearable.UPGRADE_DATA_MIGRATION_STATUS,

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -619,6 +619,7 @@ public class SettingsBackupTest {
		Settings.Global.Wearable.COOLDOWN_MODE_ON,
		Settings.Global.Wearable.BEDTIME_MODE,
		Settings.Global.Wearable.BEDTIME_HARD_MODE,
		Settings.Global.Wearable.VIBRATE_FOR_ACTIVE_UNLOCK,
		Settings.Global.Wearable.LOCK_SCREEN_STATE,
		Settings.Global.Wearable.DISABLE_AOD_WHILE_PLUGGED,
		Settings.Global.Wearable.NETWORK_LOCATION_OPT_IN,