Merge "Add Secure setting for the assist gesture's sensitivity."

2017-03-11 03:17:37 +00:00
parent 83c4712abd 80274caf49
commit a654fdd291
1 changed files with 8 additions and 0 deletions
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -6742,6 +6742,13 @@ public final class Settings {
         */
        public static final String ASSIST_GESTURE_ENABLED = "assist_gesture_enabled";

+        /**
+         * Sensitivity control for the assist gesture.
+         *
+         * @hide
+         */
+        public static final String ASSIST_GESTURE_SENSITIVITY = "assist_gesture_sensitivity";
+
        /**
         * Control whether Night display is currently activated.
         * @hide
@@ -7001,6 +7008,7 @@ public final class Settings {
            NFC_PAYMENT_DEFAULT_COMPONENT,
            AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN,
            ASSIST_GESTURE_ENABLED,
+            ASSIST_GESTURE_SENSITIVITY,
            VR_DISPLAY_MODE
        };