From cd142092a0b3c947d0c5e429ec15985271b16259 Mon Sep 17 00:00:00 2001
From: Steve Kondik <shade@chemlab.org>
Date: Wed, 25 Dec 2013 15:10:58 -0800
Subject: Snap: Remove touch AF/AEC option

 * Drop the use of the touchaf-aec parameter entirely. No camera needs
   this anymore.

Change-Id: I83154a75e5375901dc6c0fc93aef23637cfdf425
---
 res/values/qcomarrays.xml      | 11 -----------
 res/values/qcomstrings.xml     |  4 ----
 res/xml/camera_preferences.xml |  6 ------
 3 files changed, 21 deletions(-)

(limited to 'res')

diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml
index 82406eaba..48e6e463d 100644
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -298,17 +298,6 @@
         <item>AE-Bracket</item>
     </string-array>
 
-    <!-- Touch AF/AEC -->
-    <string-array name="pref_camera_touchafaec_entries" translatable="false">
-        <item>@string/setting_off</item>
-        <item>@string/setting_on</item>
-    </string-array>
-
-    <string-array name="pref_camera_touchafaec_entryvalues" translatable="false">
-        <item>touch-off</item>
-        <item>touch-on</item>
-    </string-array>
-
     <!-- Stabilization -->
     <string-array name="pref_camera_dis_entries" translatable="false">
         <item>@string/setting_off</item>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 650eb7259..c13e04321 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -257,10 +257,6 @@
     <string name="pref_camera_coloreffect_entry_bluetint">Blue tint</string>
     <string name="pref_camera_coloreffect_entry_greentint">Green tint</string>
 
-    <!-- Touch AF/AEC -->
-    <string name="pref_camera_touchafaec_title">Touch AF/AEC</string>
-    <string name="pref_camera_touchafaec_default" translatable="false">touch-on</string>
-
     <!-- Stabilization -->
     <string name="pref_camera_dis_title">Stabilization</string>
     <string name="pref_camera_dis_default" translatable="false">disable</string>
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index 638431f9b..075367c79 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -163,12 +163,6 @@
             camera:singleIcon="@drawable/ic_settings_quality"
             camera:entries="@array/pref_camera_jpegquality_entries"
             camera:entryValues="@array/pref_camera_jpegquality_entryvalues" />
-    <ListPreference
-            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:entryValues="@array/pref_camera_touchafaec_entryvalues" />
     <IconListPreference
             camera:key="pref_camera_iso_key"
             camera:defaultValue="@string/pref_camera_iso_default"
-- 
cgit v1.2.3