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

Commit 611cd73d authored Aug 13, 2021 by Surbhi Kadam Committed by Android (Google) Code Review Aug 13, 2021

Merge "Add wrist orientation prop to Settings provider"

parents 594724fc ac21d098

core/java/android/provider/Settings.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -16910,6 +16910,14 @@ public final class Settings {
		* @hide
		*/
		public static final String COMBINED_LOCATION_ENABLED = "combined_location_enable";

		/**
		* The wrist orientation mode of the device
		* Valid values - LEFT_WRIST_ROTATION_0 = "0" (default), LEFT_WRIST_ROTATION_180 = "1",
		* RIGHT_WRIST_ROTATION_0 = "2", RIGHT_WRIST_ROTATION_180 = "3"
		* @hide
		*/
		public static final String WRIST_ORIENTATION_MODE = "wear_wrist_orientation_mode";
		}
		}

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -317,6 +317,8 @@ public class GlobalSettingsValidators {
		NON_NEGATIVE_INTEGER_VALIDATOR);
		VALIDATORS.put(Global.Wearable.BURN_IN_PROTECTION_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.Wearable.COMBINED_LOCATION_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.Wearable.WRIST_ORIENTATION_MODE,
		new DiscreteValueValidator(new String[] {"0", "1", "2", "3"}));
		}
		}

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -666,7 +666,8 @@ public class SettingsBackupTest {
		Settings.Global.Wearable.MASTER_GESTURES_ENABLED,
		Settings.Global.Wearable.UNGAZE_ENABLED,
		Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MS,
		Settings.Global.Wearable.BURN_IN_PROTECTION_ENABLED);
		Settings.Global.Wearable.BURN_IN_PROTECTION_ENABLED,
		Settings.Global.Wearable.WRIST_ORIENTATION_MODE);

		private static final Set<String> BACKUP_DENY_LIST_SECURE_SETTINGS =
		newHashSet(