Merge "Add assist gesture silence and wake settings" into oc-dr1-dev am: 6eacc1a4ba (a2053ecf) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+19 −0

Original line number	Diff line number	Diff line
		@@ -6809,6 +6809,22 @@ public final class Settings {
		*/
		public static final String ASSIST_GESTURE_SENSITIVITY = "assist_gesture_sensitivity";

		/**
		* Whether the assist gesture should silence alerts.
		*
		* @hide
		*/
		public static final String ASSIST_GESTURE_SILENCE_ALERTS_ENABLED =
		"assist_gesture_silence_alerts_enabled";

		/**
		* Whether the assist gesture should wake the phone.
		*
		* @hide
		*/
		public static final String ASSIST_GESTURE_WAKE_ENABLED =
		"assist_gesture_wake_enabled";

		/**
		* Whether Assist Gesture Deferred Setup has been completed
		*
		@@ -7103,6 +7119,9 @@ public final class Settings {
		AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN,
		ASSIST_GESTURE_ENABLED,
		ASSIST_GESTURE_SENSITIVITY,
		ASSIST_GESTURE_SETUP_COMPLETE,
		ASSIST_GESTURE_SILENCE_ALERTS_ENABLED,
		ASSIST_GESTURE_WAKE_ENABLED,
		VR_DISPLAY_MODE,
		NOTIFICATION_BADGING
		};