From a6399db52a9fcb3ff38975a7878b1f9df78c88e1 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

Author: Steve Kondik <shade@chemlab.org>
Date:   Wed Dec 25 15:10:58 2013 -0800

    Snap: Remove touch AF/AEC option

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

    Change-Id: I83154a75e5375901dc6c0fc93aef23637cfdf425

Author: Steve Kondik <steve@cyngn.com>
Date:   Sun Jul 31 19:09:37 2016 -0700

    snap: Always turn touch-af-aec on

     * Most cameras do this by default, but on at least one device
       it starts with the option disabled. This stops AEC from
       updating during touch focus.

    Change-Id: I4bdb6cdbad86f3798c0288d6a32b7e8062e297f3

Change-Id: Ia3f4a312af1b4b7b6e4c0d3f76c09efe798c730c
---
 res/values/qcomarrays.xml      | 12 ------------
 res/values/qcomstrings.xml     | 10 ----------
 res/xml/camera_preferences.xml |  6 ------
 3 files changed, 28 deletions(-)

(limited to 'res')

diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml
index a89b79d4c..7a261ea5f 100755
--- 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 6aec7d5df..e0fe7c895 100755
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -560,16 +560,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">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>
-
     <!-- Select IS title -->
     <string name="pref_camera_dis_title">Image Stabilization</string>
 
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index f62711332..5990ae8ef 100755
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -178,12 +178,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