SnapdragonCamera: Camera2 add dual camera

Add Camera2 dual camera support to SnapdragonCamera

CRs-Fixed: 989750
Change-Id: I45a749ad03a531286a39cbfcfdcb65e5cad4759e

4 files changed, 46 insertions, 21 deletions

diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml
index 2715dcbe2..02c32acab 100644
--- a/res/layout/capture_module.xml
+++ b/res/layout/capture_module.xml
@@ -40,8 +40,8 @@
 
         <SurfaceView
             android:id="@+id/mdp_preview_content2"
-            android:layout_width="100dp"
-            android:layout_height="100dp" />
+            android:layout_width="300dp"
+            android:layout_height="300dp" />
     </FrameLayout>
 
     <View
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml
index 5417195f2..b80d0fdc9 100644
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -845,4 +845,14 @@
         <item>@string/pref_camera_dual_camera_value_bayer</item>
         <item>@string/pref_camera_dual_camera_value_mono</item>
     </string-array>
+
+    <string-array name="pref_camera_mono_preview_entries" translatable="true">
+        <item>@string/pref_camera_mono_preview_entry_on</item>
+        <item>@string/pref_camera_mono_preview_entry_off</item>
+    </string-array>
+
+    <string-array name="pref_camera_mono_preview_entryvalues" translatable="false">
+        <item>@string/pref_camera_mono_preview_value_on</item>
+        <item>@string/pref_camera_mono_preview_value_off</item>
+    </string-array>
 </resources>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index b1c9b4177..d8b6b6c1a 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -512,25 +512,6 @@
     <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
     <string name="disable_TNR_during_SeeMore">Enabling SeeMore will disable TNR</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">bayer</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>
-
     <!-- TODO: Remove these? -->
     <string name="pref_camera_redeyereduction_entry_disable" translatable="false">disable</string>
 
@@ -551,4 +532,31 @@
     <string name="pref_camera_manual_exp_value_user_setting" translatable="false">user-setting</string>
 
     <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>
+
 </resources>
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index 4920ef1f5..e2d749f8c 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -377,4 +377,11 @@
             camera:title="@string/pref_camera_dual_camera_title"
             camera:entries="@array/pref_camera_dual_camera_entries"
             camera:entryValues="@array/pref_camera_dual_camera_entryvalues" />
+
+    <ListPreference
+        camera:key="pref_camera_mono_preview_key"
+        camera:defaultValue="@string/pref_camera_mono_preview_default"
+        camera:title="@string/pref_camera_mono_preview_title"
+        camera:entries="@array/pref_camera_mono_preview_entries"
+        camera:entryValues="@array/pref_camera_mono_preview_entryvalues" />
 </PreferenceGroup>