diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-09-09 17:49:57 -0700 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2015-09-09 17:49:57 -0700 |
| commit | 5a9bb9516d016549730d49cddcc2b2ee0e7a4e93 (patch) | |
| tree | 2f38d805a16b47bf101f03fe97af65c6685cb012 /core/java/android | |
| parent | 5b9f8dd73fc08ac738002b5259bbfdbae8839b49 (diff) | |
| parent | 5d0e02b64e5b860e989268d1e7fd882e5fd47919 (diff) | |
resolved conflicts for 5d0e02b6 to cw-e-dev
Change-Id: Id974d29581304dc644659d1c470b5413d847944b
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/provider/Settings.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 89de101c59e1..501b771ec67a 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -5719,6 +5719,15 @@ public final class Settings { public static final String CAMERA_GESTURE_DISABLED = "camera_gesture_disabled"; /** + * Whether the camera launch gesture to double tap the power button when the screen is off + * should be disabled. + * + * @hide + */ + public static final String CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED = + "camera_double_tap_power_gesture_disabled"; + + /** * This are the settings to be backed up. * * NOTE: Settings are backed up and restored in the order they appear |