diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-02-17 02:12:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-02-17 02:12:58 +0000 |
| commit | d2bd42e736804aeed687fb82bba707ba8819b8a1 (patch) | |
| tree | 95bd85be207c19f083dce0ea8fece8c40e8f19df /core/java | |
| parent | 1ad4f0e60b3915ae04c4d11751bee627928349ad (diff) | |
| parent | c4cc308c85b8bc5cc97b7ab412c4b2ea30524527 (diff) | |
Merge "Add Secure setting for the assist gesture."
Diffstat (limited to 'core/java')
| -rwxr-xr-x | core/java/android/provider/Settings.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 9ecc63896e2f..aca41b8de92a 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -6716,6 +6716,13 @@ public final class Settings { "camera_double_twist_to_flip_enabled"; /** + * Whether the assist gesture should be enabled. + * + * @hide + */ + public static final String ASSIST_GESTURE_ENABLED = "assist_gesture_enabled"; + + /** * Control whether Night display is currently activated. * @hide */ @@ -6966,7 +6973,8 @@ public final class Settings { DOZE_PULSE_ON_PICK_UP, DOZE_PULSE_ON_DOUBLE_TAP, NFC_PAYMENT_DEFAULT_COMPONENT, - AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN + AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN, + ASSIST_GESTURE_ENABLED }; /** |