From c095a7b1870230d9d1e4c991c1dc1a29a1cc8dcd Mon Sep 17 00:00:00 2001
From: codeworkx <codeworkx@cyanogenmod.org>
Date: Wed, 6 Jan 2016 12:25:10 +0100
Subject: Snap: Add support for mw_continuous-picture focus mode

Author: codeworkx <codeworkx@cyanogenmod.org>
Date:   Wed Jan 6 12:25:10 2016 +0100

    Snap: Add support for mw_continuous-picture focus mode

    Change-Id: If165370b52d7454c69e2cdeb9d837d049010b0e8

Author: Michael W <baddaemon87@gmail.com>
Date:   Sat Oct 22 14:47:09 2016 +0200

    Snap: Fix possible NPE

    Seems like getSupportedFocusModes() can return null.
    Check for null before using it further

    Change-Id: I46860f780b99970cbe9857c8ba73691d69321488
    Reference: BugDumps 20161014-20 L#131

Change-Id: I066a26043cc89b3037e457d8da340ed4b005ee1f
---
 res/values/arrays.xml     | 3 +++
 res/values/cm_strings.xml | 1 +
 2 files changed, 4 insertions(+)

(limited to 'res')

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index b1d3b38fb..ec7130af6 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -311,6 +311,7 @@
     <string-array name="pref_camera_focusmode_entries" translatable="false">
         <item>@string/pref_camera_focusmode_entry_auto</item>
         <item>@string/pref_camera_focusmode_entry_continuous</item>
+        <item>@string/pref_camera_focusmode_entry_mw_continuous</item>
         <item>@string/pref_camera_focusmode_entry_extended</item>
         <item>@string/pref_camera_focusmode_entry_facedetect</item>
         <item>@string/pref_camera_focusmode_entry_facepriority</item>
@@ -325,6 +326,7 @@
     <string-array name="pref_camera_focusmode_entryvalues" translatable="false">
         <item>auto</item>
         <item>continuous-picture</item>
+        <item>mw_continuous-picture</item>
         <item>extended</item>
         <item>facedetect</item>
         <item>face-priority</item>
@@ -788,6 +790,7 @@
 
     <!-- Default focus mode setting.-->
     <string-array name="pref_camera_focusmode_default_array" translatable="false">
+        <item>mw_continuous-picture</item>
         <item>continuous-picture</item>
         <item>auto</item>
     </string-array>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index bf2766c5b..a5fb6d53e 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -62,6 +62,7 @@
 
     <!-- Settings screen, focus mode -->
     <string name="pref_camera_focusmode_entry_continuous">Continuous</string>
+    <string name="pref_camera_focusmode_entry_mw_continuous">Continuous (MW)</string>
     <string name="pref_camera_focusmode_entry_extended">Extended</string>
     <string name="pref_camera_focusmode_entry_facedetect">Face detect</string>
     <string name="pref_camera_focusmode_entry_facepriority">Face priority</string>
-- 
cgit v1.2.3