Merge "Add Tap Gesture for Aware Settings" into qt-qpr1-dev (e39c7bd2) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -8961,6 +8961,14 @@ public final class Settings {

	private static final Validator AWARE_LOCK_ENABLED_VALIDATOR = BOOLEAN_VALIDATOR;		private static final Validator AWARE_LOCK_ENABLED_VALIDATOR = BOOLEAN_VALIDATOR;

			/**
			* Controls whether tap gesture is enabled.
			* @hide
			*/
			public static final String TAP_GESTURE = "tap_gesture";

			private static final Validator TAP_GESTURE_VALIDATOR = BOOLEAN_VALIDATOR;

	/**		/**
	* This are the settings to be backed up.		* This are the settings to be backed up.
	*		*
	@@ -9294,6 +9302,7 @@ public final class Settings {
	VALIDATORS.put(AWARE_LOCK_ENABLED, AWARE_LOCK_ENABLED_VALIDATOR);		VALIDATORS.put(AWARE_LOCK_ENABLED, AWARE_LOCK_ENABLED_VALIDATOR);
	VALIDATORS.put(AWARE_TAP_PAUSE_GESTURE_COUNT, NON_NEGATIVE_INTEGER_VALIDATOR);		VALIDATORS.put(AWARE_TAP_PAUSE_GESTURE_COUNT, NON_NEGATIVE_INTEGER_VALIDATOR);
	VALIDATORS.put(AWARE_TAP_PAUSE_TOUCH_COUNT, NON_NEGATIVE_INTEGER_VALIDATOR);		VALIDATORS.put(AWARE_TAP_PAUSE_TOUCH_COUNT, NON_NEGATIVE_INTEGER_VALIDATOR);
			VALIDATORS.put(TAP_GESTURE, TAP_GESTURE_VALIDATOR);
	}		}

	/**		/**

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -731,6 +731,7 @@ public class SettingsBackupTest {
	Settings.Secure.SILENCE_GESTURE,		Settings.Secure.SILENCE_GESTURE,
	Settings.Secure.DOZE_WAKE_LOCK_SCREEN_GESTURE,		Settings.Secure.DOZE_WAKE_LOCK_SCREEN_GESTURE,
	Settings.Secure.DOZE_WAKE_DISPLAY_GESTURE,		Settings.Secure.DOZE_WAKE_DISPLAY_GESTURE,
			Settings.Secure.TAP_GESTURE,
	Settings.Secure.FACE_UNLOCK_RE_ENROLL);		Settings.Secure.FACE_UNLOCK_RE_ENROLL);

	@Test		@Test