From d30e42697621f169259df36fe59ce7f302aca623 Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Tue, 4 Aug 2015 11:22:29 -0400
Subject: Add setting to disable camera gesture

Bug: 22183841
Change-Id: I6ada3d2c911fd52e2821f12f3db5d549879941f4
---
 res/values/strings.xml       | 7 +++++++
 res/xml/display_settings.xml | 6 ++++++
 2 files changed, 13 insertions(+)

(limited to 'res')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index c269b99..9fa9225 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6949,4 +6949,11 @@
     <string name="write_settings_on">Yes</string>
     <!-- Summary of app not allowed to write system settings [CHAR LIMIT=45] -->
     <string name="write_settings_off">No</string>
+
+    <!-- Title of setting that controls gesture to open camera [CHAR LIMIT=40] -->
+    <string name="camera_gesture_title">Double twist for camera</string>
+
+    <!-- Description of setting that controls gesture to open camera [CHAR LIMIT=NONE] -->
+    <string name="camera_gesture_desc">Open the camera app by twisting your wrist twice</string>
+
 </resources>
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index e04d818..b5157e4 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -57,6 +57,12 @@
                 android:entries="@array/screen_timeout_entries"
                 android:entryValues="@array/screen_timeout_values" />
 
+        <SwitchPreference
+                android:key="camera_gesture"
+                android:title="@string/camera_gesture_title"
+                android:summary="@string/camera_gesture_desc"
+                android:persistent="false" />
+
         <PreferenceScreen
                 android:key="screensaver"
                 android:title="@string/screensaver_settings_title"
-- 
cgit v1.1