diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-09-09 18:38:54 -0700 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2015-09-09 18:40:05 -0700 |
| commit | 00cd47a2d2147eaba031771fd7e8b6fdbf25cf46 (patch) | |
| tree | 6c44151e41d25d15f1a2005dced3a7916a8fc3a6 /core/java | |
| parent | 2e846c25b3a414faa936248f81fc43a495d0d072 (diff) | |
| parent | 0fb3f695cc273d6c97e7d80c0ac25d8fac263d3a (diff) | |
resolved conflicts for 0fb3f695 to master.
Change-Id: I679920313a872f8eb81cf00ffb6ffe037b8d0a3a
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/provider/Settings.java | 9 | ||||
| -rw-r--r-- | core/java/com/android/internal/logging/MetricsLogger.java | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index d1744b44282a..a038b0d30887 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 diff --git a/core/java/com/android/internal/logging/MetricsLogger.java b/core/java/com/android/internal/logging/MetricsLogger.java index 6da0f63f2b0d..b6240e48a1fd 100644 --- a/core/java/com/android/internal/logging/MetricsLogger.java +++ b/core/java/com/android/internal/logging/MetricsLogger.java @@ -44,6 +44,8 @@ public class MetricsLogger implements MetricsConstants { public static final int ACTION_FINGERPRINT_AUTH = 252; public static final int ACTION_FINGERPRINT_DELETE = 253; public static final int ACTION_FINGERPRINT_RENAME = 254; + public static final int ACTION_DOUBLE_TAP_POWER_CAMERA_GESTURE = 255; + public static final int ACTION_WIGGLE_CAMERA_GESTURE = 256; public static void visible(Context context, int category) throws IllegalArgumentException { if (Build.IS_DEBUGGABLE && category == VIEW_UNKNOWN) { |