SnapdragonCamera: Add SettingsManager, scene, and filter

Add SettingsManager to work as a database for settings.
It will handle all dependencies and populate the values.
Add scene mode and filter.
Restructure UI and menu by combining them and leave the
handling of settings to SettingsManager

Change-Id: I185163fdddbffd29434e6a9c41b33be6d3388f88
CRs-Fixed: 1018118

1 files changed, 29 insertions, 34 deletions

diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index b0c84b790..6acae8260 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -418,7 +418,6 @@
     <!-- HDR mode -->
     <string name="pref_camera_hdr_mode_title">HDR mode</string>
     <string name="pref_camera_hdr_mode_default" translatable="false">hdr-mode-multiframe</string>
-
     <string name="pref_camera_hdr_mode_entry_sensor">Sensor HDR</string>
     <string name="pref_camera_hdr_mode_entry_multi_frame">Multi-frame HDR</string>
 
@@ -533,41 +532,37 @@
 
     <string name="pref_camera_dis_value_disable" translatable="false">disable</string>
 
-    <string name="pref_camera_camera2_title">Camera2 Mode</string>
-    <string name="pref_camera_camera2_default">disable</string>
-    <string name="pref_camera_camera2_entry_enable">Enable</string>
-    <string name="pref_camera_camera2_entry_disable">Disable</string>
-
-    <string name="pref_camera_camera2_value_enable">enable</string>
-    <string name="pref_camera_camera2_value_disable">disable</string>
-
-    <string name="pref_camera_dual_camera_title">Dual Camera Mode</string>
-    <string name="pref_camera_dual_camera_default">dual</string>
-    <string name="pref_camera_dual_camera_entry_dual">Dual-camera Linked</string>
-    <string name="pref_camera_dual_camera_entry_bayer">Single Bayer Camera</string>
-    <string name="pref_camera_dual_camera_entry_mono">Single Mono Camera</string>
-
-    <string name="pref_camera_dual_camera_value_dual">dual</string>
-    <string name="pref_camera_dual_camera_value_bayer">bayer</string>
-    <string name="pref_camera_dual_camera_value_mono">mono</string>
-
-    <string name="pref_camera_mono_preview_title">Mono Preview</string>
-    <string name="pref_camera_mono_preview_default">off</string>
-    <string name="pref_camera_mono_preview_entry_on">On</string>
-    <string name="pref_camera_mono_preview_entry_off">Off</string>
-
-    <string name="pref_camera_mono_preview_value_on">on</string>
-    <string name="pref_camera_mono_preview_value_off">off</string>
-
-    <string name="pref_camera_clearsight_title">ClearSight</string>
-    <string name="pref_camera_clearsight_default" translatable="false">off</string>
-    <string name="pref_camera_clearsight_entry_on">On</string>
-    <string name="pref_camera_clearsight_entry_off">Off</string>
-
-    <string name="pref_camera_clearsight_value_on" translatable="false">on</string>
-    <string name="pref_camera_clearsight_value_off" translatable="false">off</string>
+    <string name="pref_camera2_camera2_title" translatable="true">Camera2 Mode</string>
+    <string name="pref_camera2_camera2_entry_enable" translatable="true">Enable</string>
+    <string name="pref_camera2_camera2_entry_disable" translatable="true">Disable</string>
+    <string name="pref_camera2_camera2_default" translatable="false">disable</string>
+    <string name="pref_camera2_camera2_value_enable" translatable="false">enable</string>
+    <string name="pref_camera2_camera2_value_disable" translatable="false">disable</string>
+
+    <string name="pref_camera2_dual_camera_title" translatable="true">Dual Camera Mode</string>
+    <string name="pref_camera2_dual_camera_entry_dual" translatable="true">Dual-camera Linked</string>
+    <string name="pref_camera2_dual_camera_entry_bayer" translatable="true">Single Bayer Camera</string>
+    <string name="pref_camera2_dual_camera_entry_mono" translatable="true">Single Mono Camera</string>
+    <string name="pref_camera2_dual_camera_default" translatable="false">1</string>
+
+    <string name="pref_camera2_mono_preview_title" translatable="true">Mono Preview</string>
+    <string name="pref_camera2_mono_preview_entry_on" translatable="true">On</string>
+    <string name="pref_camera2_mono_preview_entry_off" translatable="true">Off</string>
+    <string name="pref_camera2_mono_preview_default" translatable="false">off</string>
+    <string name="pref_camera2_mono_preview_value_on" translatable="false">on</string>
+    <string name="pref_camera2_mono_preview_value_off" translatable="false">off</string>
+
+    <string name="pref_camera2_clearsight_title" translatable="true">ClearSight</string>
+    <string name="pref_camera2_clearsight_default" translatable="false">off</string>
+    <string name="pref_camera2_clearsight_entry_on" translatable="false">On</string>
+    <string name="pref_camera2_clearsight_entry_off" translatable="false">Off</string>
+
+    <string name="pref_camera2_clearsight_value_on" translatable="false">on</string>
+    <string name="pref_camera2_clearsight_value_off" translatable="false">off</string>
 
     <string name="clearsight_capture_success">ClearSight capture successful</string>
     <string name="clearsight_capture_fail">ClearSight capture failed</string>
 
+    <string name="pref_camera2_scenemode_default" translatable="false">0</string>
+
 </resources>