summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2013-12-25 15:10:58 -0800
committerZhao Wei Liew <zhaoweiliew@lineageos.org>2017-02-09 14:00:43 +0000
commit21b3a739d56523446277254bf7ff7aeda229503b (patch)
tree65fc31be26ee61830963fe83d9b9d47fcc2a81bc /res
parent48d968543f12747298abe3f199eb843dbc583cdd (diff)
downloadandroid_packages_apps_Snap-21b3a739d56523446277254bf7ff7aeda229503b.tar.gz
android_packages_apps_Snap-21b3a739d56523446277254bf7ff7aeda229503b.tar.bz2
android_packages_apps_Snap-21b3a739d56523446277254bf7ff7aeda229503b.zip
Snap: Remove touch AF/AEC option
* Drop the use of the touchaf-aec parameter entirely. No camera needs this anymore. Change-Id: I83154a75e5375901dc6c0fc93aef23637cfdf425 (cherry picked from commit 8ba41f452222c87a733fd2d045f9c513fd8d7799)
Diffstat (limited to 'res')
-rw-r--r--res/values/qcomarrays.xml12
-rw-r--r--res/values/qcomstrings.xml6
-rw-r--r--res/xml/camera_preferences.xml7
3 files changed, 0 insertions, 25 deletions
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml
index bb4b16390..16e9c4e83 100644
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -286,18 +286,6 @@
<item>AE-Bracket</item>
</string-array>
- <!-- Camera Preferences Touch AF/AEC dialog box entries -->
- <string-array name="pref_camera_touchafaec_entries">
- <item>@string/pref_camera_touchafaec_entry_off</item>
- <item>@string/pref_camera_touchafaec_entry_on</item>
- </string-array>
-
- <!-- Do not localize entryvalues -->
- <string-array name="pref_camera_touchafaec_entryvalues">
- <item>touch-off</item>
- <item>touch-on</item>
- </string-array>
-
<!-- DIS dialog box entries -->
<string-array name="pref_camera_dis_entries">
<item>@string/pref_camera_dis_entry_off</item>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index db3e559a6..97ca0ded2 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -505,12 +505,6 @@
<string name="pref_camera_coloreffect_entry_bluetint">Blue tint</string>
<string name="pref_camera_coloreffect_entry_greentint">Green tint</string>
- <!-- Default Touch AF/AEC setting. Do not translate. -->
- <string name="pref_camera_touchafaec_default" translatable="false">touch-on</string>
-
- <!-- Settings screen, Select Touch AF/AEC title -->
- <string name="pref_camera_touchafaec_title">Touch AF/AEC</string>
-
<!-- Settings screen, Touch AF/AEC dialog radio button choices -->
<string name="pref_camera_touchafaec_entry_off">Off</string>
<string name="pref_camera_touchafaec_entry_on">On</string>
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index 261bd8f15..39bc9cb1f 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -184,13 +184,6 @@
camera:entries="@array/pref_camera_jpegquality_entries"
camera:entryValues="@array/pref_camera_jpegquality_entryvalues" />
<IconListPreference
- camera:key="pref_camera_touchafaec_key"
- camera:defaultValue="@string/pref_camera_touchafaec_default"
- camera:title="@string/pref_camera_touchafaec_title"
- camera:entries="@array/pref_camera_touchafaec_entries"
- camera:singleIcon="@drawable/ic_settings_touchafec"
- camera:entryValues="@array/pref_camera_touchafaec_entryvalues" />
- <IconListPreference
camera:key="pref_camera_iso_key"
camera:defaultValue="@string/pref_camera_iso_default"
camera:title="@string/pref_camera_iso_title"