diff options
| author | Jason Monk <jmonk@google.com> | 2015-08-11 13:55:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-11 13:55:54 +0000 |
| commit | 746886c59a20dc33d62c2dd500fd27edcf0abcca (patch) | |
| tree | 9077beefcd5e7517a0b4b6835466a2eb563ef546 /res | |
| parent | e9bcef3541435c1e1a2716d48eb1c1c897841880 (diff) | |
| parent | d30e42697621f169259df36fe59ce7f302aca623 (diff) | |
| download | packages_apps_Settings-746886c59a20dc33d62c2dd500fd27edcf0abcca.zip packages_apps_Settings-746886c59a20dc33d62c2dd500fd27edcf0abcca.tar.gz packages_apps_Settings-746886c59a20dc33d62c2dd500fd27edcf0abcca.tar.bz2 | |
Merge "Add setting to disable camera gesture" into mnc-dr-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 7 | ||||
| -rw-r--r-- | res/xml/display_settings.xml | 6 |
2 files changed, 13 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 38b33ac..88269e8 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -6981,4 +6981,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" |