From 82839f53cbff9807554407f0d51fcc71b785f7ad Mon Sep 17 00:00:00 2001
From: Jay Wang <jaywang@codeaurora.org>
Date: Mon, 25 Jul 2016 10:20:17 -0700
Subject: SnapdragonCamera: Saving MPO and DDM without CS

Saving MPO and DDM without CS

CRs-Fixed: 993611
Change-Id: Ie04bce460c57454b4cf57c88b47ef2a495b6e078
---
 res/values/camera2arrays.xml | 11 +++++++++++
 res/values/qcomstrings.xml   | 12 ++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

(limited to 'res/values')

diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml
index 25105ba65..37a33ec17 100644
--- a/res/values/camera2arrays.xml
+++ b/res/values/camera2arrays.xml
@@ -100,6 +100,17 @@
         <item>@string/pref_camera2_clearsight_value_on</item>
     </string-array>
 
+    <string-array name="pref_camera2_mpo_entries" translatable="true">
+        <item>@string/pref_camera2_mpo_entry_off</item>
+        <item>@string/pref_camera2_mpo_entry_on</item>
+    </string-array>
+
+    <string-array name="pref_camera2_mpo_entryvalues" translatable="false">
+        <item>@string/pref_camera2_mpo_value_off</item>
+        <item>@string/pref_camera2_mpo_value_on</item>
+    </string-array>
+
+
     <!-- Refer to CONTROL_SCENE_MODE of Camera2 API for values
         -1 refers to ones not supported in Camera2 API
         0 is special case added for auto (meaning off)
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index e8917f3ee..0fb750590 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -968,8 +968,8 @@
 
     <string name="pref_camera2_clearsight_title" translatable="true">ClearSight</string>
     <string name="pref_camera2_clearsight_default" translatable="false">on</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_entry_on" translatable="true">On</string>
+    <string name="pref_camera2_clearsight_entry_off" translatable="true">Off</string>
 
     <string name="pref_camera2_clearsight_value_on" translatable="false">on</string>
     <string name="pref_camera2_clearsight_value_off" translatable="false">off</string>
@@ -977,6 +977,14 @@
     <string name="clearsight_capture_success">ClearSight capture successful</string>
     <string name="clearsight_capture_fail">ClearSight capture failed</string>
 
+    <string name="pref_camera2_mpo_title" translatable="true">MPO Format</string>
+    <string name="pref_camera2_mpo_default" translatable="false">off</string>
+    <string name="pref_camera2_mpo_entry_on" translatable="true">On</string>
+    <string name="pref_camera2_mpo_entry_off" translatable="true">Off</string>
+
+    <string name="pref_camera2_mpo_value_on" translatable="false">on</string>
+    <string name="pref_camera2_mpo_value_off" translatable="false">off</string>
+
     <string name="pref_camera2_scenemode_default" translatable="false">0</string>
     <string name="pref_camera2_whitebalance_default" translatable="false">1</string>
     <string name="pref_camera2_coloreffect_default" translatable="false">0</string>
-- 
cgit v1.2.3