From 19656479581c4cdda53e6af6acfcb3346b97164a Mon Sep 17 00:00:00 2001
From: Dimitar Borisov <dboris@codeaurora.org>
Date: Wed, 24 Sep 2014 17:32:06 +0300
Subject: SnapdragonCamera: Add support for CDS and TNR settings

Add support for CDS and TNR settings

- CDS and TNR can be controlled in
  photo mode and video mode.
- CDS is set to off and cannot be
  set to other value when TNR is enabled
- CDS value is restored when TNR is disabled again

CRs-Fixed: 715042
Change-Id: Idf08403e38d0e3e634b047a955f2328b4237e691
---
 res/values/qcomarrays.xml      | 48 ++++++++++++++++++++++++++++++++++
 res/values/qcomstrings.xml     | 58 ++++++++++++++++++++++++++++++++++++++++++
 res/xml/camera_preferences.xml | 12 +++++++++
 res/xml/video_preferences.xml  | 12 +++++++++
 4 files changed, 130 insertions(+)

(limited to 'res')

diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml
index 39f177adf..9f879ceed 100644
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -609,6 +609,54 @@
     <item>@string/pref_camera_auto_hdr_value_disable</item>
     </string-array>
 
+    <!-- CDS  dialog box entries -->
+    <string-array name="pref_camera_cds_entries" translatable="false">
+    <item>@string/pref_camera_cds_entry_off</item>
+    <item>@string/pref_camera_cds_entry_on</item>
+    <item>@string/pref_camera_cds_entry_auto</item>
+    </string-array>
+
+    <string-array name="pref_camera_cds_entryvalues" translatable="false">
+    <item>@string/pref_camera_cds_value_off</item>
+    <item>@string/pref_camera_cds_value_on</item>
+    <item>@string/pref_camera_cds_value_auto</item>
+    </string-array>
+
+    <!-- video CDS  dialog box entries -->
+    <string-array name="pref_camera_video_cds_entries" translatable="false">
+    <item>@string/pref_camera_video_cds_entry_off</item>
+    <item>@string/pref_camera_video_cds_entry_on</item>
+    <item>@string/pref_camera_video_cds_entry_auto</item>
+    </string-array>
+
+    <string-array name="pref_camera_video_cds_entryvalues" translatable="false">
+    <item>@string/pref_camera_video_cds_value_off</item>
+    <item>@string/pref_camera_video_cds_value_on</item>
+    <item>@string/pref_camera_video_cds_value_auto</item>
+    </string-array>
+
+    <!-- TNR  dialog box entries -->
+    <string-array name="pref_camera_tnr_entries" translatable="false">
+    <item>@string/pref_camera_tnr_entry_disable</item>
+    <item>@string/pref_camera_tnr_entry_enable</item>
+    </string-array>
+
+    <string-array name="pref_camera_tnr_entryvalues" translatable="false">
+    <item>@string/pref_camera_tnr_value_off</item>
+    <item>@string/pref_camera_tnr_value_on</item>
+    </string-array>
+
+    <!-- video TNR  dialog box entries -->
+    <string-array name="pref_camera_video_tnr_entries" translatable="false">
+    <item>@string/pref_camera_video_tnr_entry_disable</item>
+    <item>@string/pref_camera_video_tnr_entry_enable</item>
+    </string-array>
+
+    <string-array name="pref_camera_video_tnr_entryvalues" translatable="false">
+    <item>@string/pref_camera_video_tnr_value_off</item>
+    <item>@string/pref_camera_video_tnr_value_on</item>
+    </string-array>
+
     <!-- Camera Preferences Selectable HDR modes dialog box entries -->
     <string-array name="pref_camera_hdr_mode_entries" translatable="false">
         <item>@string/pref_camera_hdr_mode_entry_sensor</item>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 9c5865942..9cd10d24f 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -175,11 +175,69 @@
     <string name="pref_camera_video_hdr_value_off">off</string>
     <string name="pref_camera_video_hdr_value_on">on</string>
 
+    <!-- Settings screen, CDS location dialog choices -->
+    <string name="pref_camera_cds_entry_off">Off</string>
+    <string name="pref_camera_cds_entry_on">On</string>
+    <string name="pref_camera_cds_entry_auto">Auto</string>
+
+    <string name="pref_camera_cds_value_off">off</string>
+    <string name="pref_camera_cds_value_on">on</string>
+    <string name="pref_camera_cds_value_auto">auto</string>
+
+     <!-- Settings screen, video CDS location dialog choices -->
+    <string name="pref_camera_video_cds_entry_off">Off</string>
+    <string name="pref_camera_video_cds_entry_on">On</string>
+    <string name="pref_camera_video_cds_entry_auto">Auto</string>
+
+    <string name="pref_camera_video_cds_value_off">off</string>
+    <string name="pref_camera_video_cds_value_on">on</string>
+    <string name="pref_camera_video_cds_value_auto">auto</string>
+
+    <!-- Settings screen, TNR location dialog choices -->
+    <string name="pref_camera_tnr_entry_disable">Disable</string>
+    <string name="pref_camera_tnr_entry_enable">Enable</string>
+
+    <!-- Settings screen, TNR location dialog choices -->
+    <string name="pref_camera_tnr_value_off">off</string>
+    <string name="pref_camera_tnr_value_on">on</string>
+
+    <!-- Settings screen, video TNR location dialog choices -->
+    <string name="pref_camera_video_tnr_entry_disable">Disable</string>
+    <string name="pref_camera_video_tnr_entry_enable">Enable</string>
+
+    <!-- Settings screen, video TNR location dialog choices -->
+    <string name="pref_camera_video_tnr_value_off">off</string>
+    <string name="pref_camera_video_tnr_value_on">on</string>
+
     <!-- Settings screen, setting title text for Video HDR-->
     <string name="pref_camera_video_hdr_title">Video HDR</string>
 
     <string name="pref_camera_video_hdr_default" translatable="false">off</string>
 
+    <!-- Settings menu, setting title text for cds mode-->
+    <string name="pref_camera_cds_title">CDS mode</string>
+
+    <!-- Settings menu, setting title text for video cds mode-->
+    <string name="pref_camera_video_cds_title">Video CDS mode</string>
+
+    <!-- Default cds mode setting-->
+    <string name="pref_camera_cds_default" translatable="false">on</string>
+
+    <!-- Default video cds mode setting-->
+    <string name="pref_camera_video_cds_default" translatable="false">on</string>
+
+     <!-- Settings menu, setting title text for tnr mode-->
+    <string name="pref_camera_tnr_title">TNR mode</string>
+
+    <!-- Settings menu, setting title text for video tnr mode-->
+    <string name="pref_camera_video_tnr_title">Video TNR mode</string>
+
+    <!-- Default tnr mode setting-->
+    <string name="pref_camera_tnr_default" translatable="false">off</string>
+
+    <!-- Default video tnr mode setting-->
+    <string name="pref_camera_video_tnr_default" translatable="false">off</string>
+
     <!-- Default face  detection setting. -->
     <string name="pref_camera_facedetection_default" translatable="false">on</string>
 
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index d7f245343..4052b9634 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -74,6 +74,18 @@
             camera:title="@string/pref_camera_ae_bracket_hdr_title"
             camera:entries="@array/pref_camera_ae_bracket_hdr_entries"
             camera:entryValues="@array/pref_camera_ae_bracket_hdr_entryvalues" />
+     <ListPreference
+            camera:key="pref_camera_cds_mode_key"
+            camera:defaultValue="@string/pref_camera_cds_default"
+            camera:title="@string/pref_camera_cds_title"
+            camera:entries="@array/pref_camera_cds_entries"
+            camera:entryValues="@array/pref_camera_cds_entryvalues" />
+    <ListPreference
+            camera:key="pref_camera_tnr_mode_key"
+            camera:defaultValue="@string/pref_camera_tnr_default"
+            camera:title="@string/pref_camera_tnr_title"
+            camera:entries="@array/pref_camera_tnr_entries"
+            camera:entryValues="@array/pref_camera_tnr_entryvalues" />
     <IconListPreference
             camera:key="pref_camera_id_key"
             camera:defaultValue="@string/pref_camera_id_default"
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index 2bb99d992..c9b84d2d2 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -35,6 +35,18 @@
             camera:title="@string/pref_camera_audioencoder_title"
             camera:entries="@array/pref_camera_audioencoder_entries"
             camera:entryValues="@array/pref_camera_audioencoder_entryvalues" />
+    <ListPreference
+            camera:key="pref_camera_video_cds_mode_key"
+            camera:defaultValue="@string/pref_camera_video_cds_default"
+            camera:title="@string/pref_camera_video_cds_title"
+            camera:entries="@array/pref_camera_video_cds_entries"
+            camera:entryValues="@array/pref_camera_video_cds_entryvalues" />
+    <ListPreference
+            camera:key="pref_camera_video_tnr_mode_key"
+            camera:defaultValue="@string/pref_camera_video_tnr_default"
+            camera:title="@string/pref_camera_video_tnr_title"
+            camera:entries="@array/pref_camera_video_tnr_entries"
+            camera:entryValues="@array/pref_camera_video_tnr_entryvalues" />
     <ListPreference
             camera:key="pref_camera_video_duration_key"
             camera:defaultValue="@string/pref_camera_video_duration_default"
-- 
cgit v1.2.3