Merge "Add new Wear setting for Lockscreen" (053c947e) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+31 −0

Original line number	Diff line number	Diff line
		@@ -18199,6 +18199,37 @@ public final class Settings {
		*/
		public static final String WRIST_ORIENTATION_MODE = "wear_wrist_orientation_mode";

		/**
		* Current lock screen state of the device
		* (null = default value of this setting (lockscreen is never set),
		* 0 = {@link #LOCK_SCREEN_STATE_NONE},
		* 1 = {@link #LOCK_SCREEN_STATE_PIN},
		* 2 = {@link #LOCK_SCREEN_STATE_PATTERN})
		* @hide
		*/
		public static final String LOCK_SCREEN_STATE = "lock_screen_state";

		/**
		* No lock screen set
		* One of the possible states for {@link #LOCK_SCREEN_STATE}.
		* @hide
		*/
		public static final int LOCK_SCREEN_STATE_NONE = 0;

		/**
		* Lock screen set as a pin
		* One of the possible states for {@link #LOCK_SCREEN_STATE}.
		* @hide
		*/
		public static final int LOCK_SCREEN_STATE_PIN = 1;

		/**
		* Lock screen set as a pattern
		* One of the possible states for {@link #LOCK_SCREEN_STATE}.
		* @hide
		*/
		public static final int LOCK_SCREEN_STATE_PATTERN = 2;

		/**
		* Setting indicating the name of the Wear OS app package containing the device's sysui.
		*

+8 −0

Original line number	Diff line number	Diff line
		@@ -280,6 +280,14 @@ public class GlobalSettingsValidators {
		VALIDATORS.put(Global.Wearable.AMBIENT_LOW_BIT_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.Wearable.AMBIENT_PLUGGED_TIMEOUT_MIN, ANY_INTEGER_VALIDATOR);
		VALIDATORS.put(Global.Wearable.AMBIENT_TILT_TO_BRIGHT, BOOLEAN_VALIDATOR);
		VALIDATORS.put(
		Global.Wearable.LOCK_SCREEN_STATE,
		new DiscreteValueValidator(
		new String[] {
		String.valueOf(Global.Wearable.LOCK_SCREEN_STATE_NONE),
		String.valueOf(Global.Wearable.LOCK_SCREEN_STATE_PIN),
		String.valueOf(Global.Wearable.LOCK_SCREEN_STATE_PATTERN)
		}));
		VALIDATORS.put(
		Global.Wearable.PAIRED_DEVICE_OS_TYPE,
		new DiscreteValueValidator(

+2 −1

Original line number	Diff line number	Diff line
		@@ -659,7 +659,8 @@ public class SettingsBackupTest {
		Settings.Global.Wearable.BEDTIME_MODE,
		Settings.Global.Wearable.BEDTIME_HARD_MODE,
		Settings.Global.Wearable.EARLY_UPDATES_STATUS,
		Settings.Global.Wearable.RSB_WAKE_ENABLED);
		Settings.Global.Wearable.RSB_WAKE_ENABLED,
		Settings.Global.Wearable.LOCK_SCREEN_STATE);

		private static final Set<String> BACKUP_DENY_LIST_SECURE_SETTINGS =
		newHashSet(