Merge "Merge "Add ActiveUnlock Settings" into tm-dev am: e6c8903e65 am:... (d7b35329) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+20 −0

Original line number	Diff line number	Diff line
		@@ -9681,6 +9681,26 @@ public final class Settings {
		@Readable
		public static final String BIOMETRIC_APP_ENABLED = "biometric_app_enabled";

		/**
		* Whether or not active unlock triggers on wake.
		* @hide
		*/
		public static final String ACTIVE_UNLOCK_ON_WAKE = "active_unlock_on_wake";

		/**
		* Whether or not active unlock triggers on unlock intent.
		* @hide
		*/
		public static final String ACTIVE_UNLOCK_ON_UNLOCK_INTENT =
		"active_unlock_on_unlock_intent";

		/**
		* Whether or not active unlock triggers on biometric failure.
		* @hide
		*/
		public static final String ACTIVE_UNLOCK_ON_BIOMETRIC_FAIL =
		"active_unlock_on_biometric_fail";

		/**
		* Whether the assist gesture should be enabled.
		*

+3 −0

Original line number	Diff line number	Diff line
		@@ -117,6 +117,9 @@ public class SecureSettings {
		Settings.Secure.FACE_UNLOCK_DISMISSES_KEYGUARD,
		Settings.Secure.FACE_UNLOCK_APP_ENABLED,
		Settings.Secure.FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION,
		Settings.Secure.ACTIVE_UNLOCK_ON_WAKE,
		Settings.Secure.ACTIVE_UNLOCK_ON_UNLOCK_INTENT,
		Settings.Secure.ACTIVE_UNLOCK_ON_BIOMETRIC_FAIL,
		Settings.Secure.VR_DISPLAY_MODE,
		Settings.Secure.NOTIFICATION_BADGING,
		Settings.Secure.NOTIFICATION_DISMISS_RTL,

+3 −0

Original line number	Diff line number	Diff line
		@@ -173,6 +173,9 @@ public class SecureSettingsValidators {
		VALIDATORS.put(Secure.SHOW_MEDIA_WHEN_BYPASSING, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.FACE_UNLOCK_APP_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.ACTIVE_UNLOCK_ON_WAKE, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.ACTIVE_UNLOCK_ON_UNLOCK_INTENT, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.ACTIVE_UNLOCK_ON_BIOMETRIC_FAIL, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.ASSIST_GESTURE_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.ASSIST_GESTURE_WAKE_ENABLED, BOOLEAN_VALIDATOR);