From a794821f1f1a87368b5b52c23fbcb469ba28673e Mon Sep 17 00:00:00 2001
From: Sultanxda <sultanxda@gmail.com>
Date: Sun, 6 Dec 2015 10:30:28 -0800
Subject: Snap: Add ability to set the tap-to-focus duration to 0 sec

Author: Sultanxda <sultanxda@gmail.com>
Date:   Sun Dec 6 10:30:28 2015 -0800

    Snap: Add ability to set the tap-to-focus duration to 0 sec

    Setting a tap-to-focus duration of 0 seconds allows for a quick, manual
    refocus of the subject without interfering with the exposure. This is
    particularly useful when recording videos.

    Change-Id: Ie3d92e50f755c938e9725438ba5baad0d0985485
    Signed-off-by: Sultanxda <sultanxda@gmail.com>

Author: Michael Bestas <mikeioannina@cyanogenmod.org>
Date:   Tue Feb 9 18:51:28 2016 +0200

    Snap: Fix crash when set infinite touch-focus duration

    * java.lang.Integer.valueOf(string) method can't parse
      hexadecimal values

    Change-Id: I42706db72fc9c1093a7aa16440af449f731e5176

Change-Id: I9ae88f55a452a66af39906d46f1b899130199da2
---
 res/values/cm_arrays.xml  | 4 +++-
 res/values/cm_strings.xml | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'res')

diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml
index a1fc1cfa0..126fa7b96 100644
--- a/res/values/cm_arrays.xml
+++ b/res/values/cm_arrays.xml
@@ -27,6 +27,7 @@
 
     <!-- Touch focus duration -->
     <string-array name="pref_camera_focustime_duration_entries" translatable="false">
+        <item>@string/pref_camera_focustime_entry_0</item>
         <item>@string/pref_camera_focustime_entry_3</item>
         <item>@string/pref_camera_focustime_entry_5</item>
         <item>@string/pref_camera_focustime_entry_10</item>
@@ -35,10 +36,11 @@
 
     <!-- Stored in milliseconds -->
     <string-array name="pref_camera_focustime_duration_values" translatable="false">
+        <item>200</item>
         <item>3000</item>
         <item>5000</item>
         <item>10000</item>
-        <item>0</item>
+        <item>0x7FFFFFFF</item>
     </string-array>
 
     <!-- Shutter speed -->
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 8ce5ba208..5b8ddf306 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -112,6 +112,7 @@
     <string name="pref_camera_focustime_title">Touch focus duration</string>
     <string name="pref_camera_focustime_default" translatable="false">3000</string>
 
+    <string name="pref_camera_focustime_entry_0">0s</string>
     <string name="pref_camera_focustime_entry_3">3s</string>
     <string name="pref_camera_focustime_entry_5">5s</string>
     <string name="pref_camera_focustime_entry_10">10s</string>
-- 
cgit v1.2.3