Merge "SnapdragonCamera: Add support for manual 3A params."

4 files changed, 76 insertions, 2 deletions

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index d9312c57a..71b4afccd 100755..100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -19,7 +19,7 @@
     <!-- Camera Preferences Video Quality entries -->
     <string-array name="pref_video_quality_entries" translatable="false">
         <item>@string/pref_video_quality_entry_4kdci</item>
-		<item>@string/pref_video_quality_entry_2160p</item>
+        <item>@string/pref_video_quality_entry_2160p</item>
         <item>@string/pref_video_quality_entry_1080p</item>
         <item>@string/pref_video_quality_entry_720p</item>
         <item>@string/pref_video_quality_entry_480p</item>
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml
index 9b71634a2..0b1037e72 100644
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -559,6 +559,45 @@
          <item>@string/pref_camera_selectablezoneaf_value_frameaverage</item>
     </string-array>
 
+
+    <string-array name="pref_camera_manual_exp_entries" translatable="false">
+        <item>@string/pref_camera_manual_exp_entry_ISO_priority</item>
+        <item>@string/pref_camera_manual_exp_entry_exptime_priority</item>
+        <item>@string/pref_camera_manual_exp_entry_user_setting</item>
+        <item>@string/pref_camera_manual_exp_entry_off</item>
+    </string-array>
+
+    <string-array name="pref_camera_manual_exp_entry_values" translatable="false">
+         <item>@string/pref_camera_manual_exp_value_ISO_priority</item>
+         <item>@string/pref_camera_manual_exp_value_exptime_priority</item>
+         <item>@string/pref_camera_manual_exp_value_user_setting</item>
+         <item>@string/pref_camera_manual_exp_value_off</item>
+    </string-array>
+
+    <string-array name="pref_camera_manual_wb_entries" translatable="false">
+        <item>@string/pref_camera_manual_wb_entry_color_temperature</item>
+        <item>@string/pref_camera_manual_wb_entry_rbgb_gains</item>
+        <item>@string/pref_camera_manual_wb_entry_off</item>
+    </string-array>
+
+    <string-array name="pref_camera_manual_wb_entry_values" translatable="false">
+         <item>@string/pref_camera_manual_wb_value_color_temperature</item>
+         <item>@string/pref_camera_manual_wb_value_rbgb_gains</item>
+         <item>@string/pref_camera_manual_wb_value_off</item>
+    </string-array>
+
+    <string-array name="pref_camera_manual_focus_entries" translatable="false">
+        <item>@string/pref_camera_manual_focus_entry_scale_mode</item>
+        <item>@string/pref_camera_manual_focus_entry_diopter_mode</item>
+        <item>@string/pref_camera_manual_focus_entry_off</item>
+    </string-array>
+
+    <string-array name="pref_camera_manual_focus_entry_values" translatable="false">
+         <item>@string/pref_camera_manual_focus_value_scale_mode</item>
+         <item>@string/pref_camera_manual_focus_value_diopter_mode</item>
+         <item>@string/pref_camera_manual_focus_value_off</item>
+         </string-array>
+
     <!-- ZSL dialog box entries -->
     <string-array name="pref_camera_zsl_entries" translatable="false">
     <item>@string/pref_camera_zsl_entry_off</item>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 93a39003d..c72f9bb1e 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -166,6 +166,41 @@
      <string name="pref_camera_advanced_feature_value_trueportrait_off">true-portrait-off</string>
      <string name="pref_camera_advanced_feature_value_multi_touch_focus_off">multi-touch-focus-off</string>
 
+     <!-- Manual exposure control entry values -->
+     <string name="pref_camera_manual_exp_title">Manual Exposure</string>
+     <string name="pref_camera_manual_exp_entry_ISO_priority">ISO priority</string>
+     <string name="pref_camera_manual_exp_entry_exptime_priority">Exposure time priority</string>
+     <string name="pref_camera_manual_exp_entry_user_setting">User setting</string>
+     <string name="pref_camera_manual_exp_entry_off">Off</string>
+
+     <string name="pref_camera_manual_exp_default">off</string>
+     <string name="pref_camera_manual_exp_value_ISO_priority">iso-priority</string>
+     <string name="pref_camera_manual_exp_value_exptime_priority">exp-time-priority</string>
+     <string name="pref_camera_manual_exp_value_user_setting">user-setting</string>
+     <string name="pref_camera_manual_exp_value_off">off</string>
+
+     <!-- Manual white balance entry values -->
+     <string name="pref_camera_manual_wb_title">Manual White balance</string>
+     <string name="pref_camera_manual_wb_entry_color_temperature">Color temperature</string>
+     <string name="pref_camera_manual_wb_entry_rbgb_gains">RBGB gains</string>
+     <string name="pref_camera_manual_wb_entry_off">Off</string>
+
+     <string name="pref_camera_manual_wb_default">off</string>
+     <string name="pref_camera_manual_wb_value_color_temperature">color-temperature</string>
+     <string name="pref_camera_manual_wb_value_rbgb_gains">rbgb-gains</string>
+     <string name="pref_camera_manual_wb_value_off">off</string>
+
+     <!-- Manual Focus entry values -->
+     <string name="pref_camera_manual_focus_title">Manual Focus</string>
+     <string name="pref_camera_manual_focus_entry_scale_mode">Scale mode</string>
+     <string name="pref_camera_manual_focus_entry_diopter_mode">Diopter mode</string>
+     <string name="pref_camera_manual_focus_entry_off">Off</string>
+
+     <string name="pref_camera_manual_focus_default">off</string>
+     <string name="pref_camera_manual_focus_value_scale_mode">scale-mode</string>
+     <string name="pref_camera_manual_focus_value_diopter_mode">diopter-mode</string>
+     <string name="pref_camera_manual_focus_value_off">off</string>
+
     <!-- Settings screen, ZSL location dialog choices -->
     <string name="pref_camera_zsl_entry_off">Off</string>
     <string name="pref_camera_zsl_entry_on">On</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d597e5af0..2d3aee027 100755..100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -244,7 +244,7 @@
     Videos will be recorded in 4k DCI quality. [CHAR LIMIT=24] -->
     <string name="pref_video_quality_entry_4kdci" translatable="false">
     4k DCI</string>
-	<!-- Video quality setting entry.
+    <!-- Video quality setting entry.
     Videos will be recorded in 4k UHD quality. [CHAR LIMIT=24] -->
     <string name="pref_video_quality_entry_2160p" translatable="false">
     4k UHD</string>