From fbab8d258597af06e6fe5e82d6b09a49116bc703 Mon Sep 17 00:00:00 2001
From: Camera Software Integration <camswint@localhost>
Date: Wed, 29 Jul 2015 11:29:17 -0700
Subject: SnapdragonCamera: Add noise reduction modes.

- Add menu for noise reduction modes

Change-Id: Ie5cd6590e08938fb8fbb668ac1b48aac5fe801c3
---
 res/values/qcomarrays.xml     | 16 +++++++++++++++-
 res/values/qcomstrings.xml    | 17 +++++++++++++++++
 res/values/strings.xml        | 12 ++++++++++++
 res/xml/video_preferences.xml |  8 +++++++-
 4 files changed, 51 insertions(+), 2 deletions(-)

(limited to 'res')

diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml
index 2b565fd56..0bacfe3a9 100644
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -513,13 +513,27 @@
     <string-array name="pref_camera_facedetection_entries" translatable="false">
         <item>@string/setting_off</item>
         <item>@string/setting_on</item>
-    </string-array>
+     </string-array>
 
     <string-array name="pref_camera_facedetection_entryvalues" translatable="false">
         <item>off</item>
         <item>on</item>
     </string-array>
 
+     <!-- Video Preferences Noise Reduction dialog box entries -->
+     <string-array name="pref_camera_noise_reduction_entries">
+          <item>@string/pref_camera_noise_reduction_entry_off</item>
+          <item>@string/pref_camera_noise_reduction_entry_fast</item>
+          <item>@string/pref_camera_noise_reduction_entry_high_quality</item>
+     </string-array>
+
+     <!-- Do not localize entryvalues -->
+     <string-array name="pref_camera_noise_reduction_entryvalues" translatable="false">
+          <item>@string/pref_camera_noise_reduction_value_off</item>
+          <item>@string/pref_camera_noise_reduction_value_fast</item>
+          <item>@string/pref_camera_noise_reduction_value_high_quality</item>
+     </string-array>
+
     <!-- Denoise -->
     <string-array name="pref_camera_denoise_entries" translatable="false">
         <item>@string/setting_off</item>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index f54df4f41..371c03ac8 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -195,6 +195,23 @@
 
     <!-- Denoise -->
     <string name="pref_camera_denoise_title">Denoise</string>
+
+     <!-- Default noise reduction setting. Do not translate. -->
+     <string name="pref_camera_noise_reduction_default">off</string>
+
+     <!-- Settings screen, Select See More title -->
+     <string name="pref_camera_noise_reduction_title">Noise Reduction</string>
+
+     <!-- Settings screen, see more radio button choices -->
+     <string name="pref_camera_noise_reduction_entry_off">Off</string>
+     <string name="pref_camera_noise_reduction_entry_fast">Fast</string>
+     <string name="pref_camera_noise_reduction_entry_high_quality">High Quality</string>
+
+     <!-- see more entry values. Do not translate. -->
+     <string name="pref_camera_noise_reduction_value_off">off</string>
+     <string name="pref_camera_noise_reduction_value_fast">fast</string>
+     <string name="pref_camera_noise_reduction_value_high_quality">high-quality</string>
+
     <string name="pref_camera_denoise_default" translatable="false">denoise-on</string>
 
     <!-- ISO -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7f97f5a9c..ddadda6e2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -385,6 +385,18 @@
     <!-- Toast after trying to select a setting that is not allowed to change in scene mode [CHAR LIMIT=NONE] -->
     <string name="not_selectable_in_scene_mode">Not selectable in scene mode.</string>
 
+    <!-- Toast after High Quality Noise Reduction has been enabled to show CDS is disabled -->
+    <string name="disable_CDS_during_HighQualityNoiseReduction">High Quality Noise Reduction will disable CDS</string>
+
+    <!-- Toast after High Quality Noise Reduction has been enabled to show TNR is disabled -->
+    <string name="disable_TNR_during_HighQualityNoiseReduction">High Quality Noise Reduction will disable TNR</string>
+
+    <!-- Toast after SeeMore has been enabled to show CDS is disabled -->
+    <string name="disable_CDS_during_SeeMore">SeeMore will disable CDS.</string>
+
+    <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
+    <string name="disable_TNR_during_SeeMore">SeeMore will disable TNR.</string>
+
     <!-- Exposure settings in preference -->
     <string name="pref_exposure_title">Exposure</string>
     <string name="pref_exposure_default" translatable="false">0</string>
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index f4f8522ba..2cf47b5ee 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -131,7 +131,13 @@
             camera:singleIcon="@drawable/ic_settings_fps"
             camera:entries="@array/pref_camera_hfr_entries"
             camera:entryValues="@array/pref_camera_hfr_entryvalues"/>
-    <IconListPreference
+    <ListPreference
+            camera:key="pref_camera_noise_reduction_key"
+            camera:defaultValue="@string/pref_camera_noise_reduction_default"
+            camera:title="@string/pref_camera_noise_reduction_title"
+            camera:entries="@array/pref_camera_noise_reduction_entries"
+            camera:entryValues="@array/pref_camera_noise_reduction_entryvalues"/>
+    <ListPreference
             camera:key="pref_camera_see_more_key"
             camera:defaultValue="@string/pref_camera_see_more_default"
             camera:title="@string/pref_camera_see_more_title"
-- 
cgit v1.2.3