summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorByunghun Jeon <bjeon@codeaurora.org>2015-11-17 14:20:30 -0800
committerSteve Kondik <steve@cyngn.com>2016-08-25 21:55:20 -0700
commit075630e6a853d472cb35e31cb7454596da1bfa0b (patch)
tree42df9f8a368c216c6ef4923a2ec8f9af43f0fb4f /res/values
parent39b3dfdfc54fdcdf2ca8a65c4351043b9bb0f9d1 (diff)
downloadandroid_packages_apps_Snap-075630e6a853d472cb35e31cb7454596da1bfa0b.tar.gz
android_packages_apps_Snap-075630e6a853d472cb35e31cb7454596da1bfa0b.tar.bz2
android_packages_apps_Snap-075630e6a853d472cb35e31cb7454596da1bfa0b.zip
SnapdragonCamera: Add Camera2 mode
Use camera2 API to show preview and take snapshot CRs-Fixed: 989750 Change-Id: I07e2d6743529b3d3d5acecf667e9493465a094c9
Diffstat (limited to 'res/values')
-rw-r--r--res/values/qcomarrays.xml22
-rw-r--r--res/values/qcomstrings.xml19
2 files changed, 41 insertions, 0 deletions
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml
index 2b565fd56..5417195f2 100644
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -823,4 +823,26 @@
<item>0</item>
<item>1</item>
</string-array>
+
+ <string-array name="pref_camera_camera2_entries" translatable="true">
+ <item>@string/pref_camera_camera2_entry_enable</item>
+ <item>@string/pref_camera_camera2_entry_disable</item>
+ </string-array>
+
+ <string-array name="pref_camera_camera2_entryvalues" translatable="false">
+ <item>@string/pref_camera_camera2_value_enable</item>
+ <item>@string/pref_camera_camera2_value_disable</item>
+ </string-array>
+
+ <string-array name="pref_camera_dual_camera_entries" translatable="true">
+ <item>@string/pref_camera_dual_camera_entry_dual</item>
+ <item>@string/pref_camera_dual_camera_entry_bayer</item>
+ <item>@string/pref_camera_dual_camera_entry_mono</item>
+ </string-array>
+
+ <string-array name="pref_camera_dual_camera_entryvalues" translatable="false">
+ <item>@string/pref_camera_dual_camera_value_dual</item>
+ <item>@string/pref_camera_dual_camera_value_bayer</item>
+ <item>@string/pref_camera_dual_camera_value_mono</item>
+ </string-array>
</resources>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 1753e42eb..b1c9b4177 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -512,6 +512,25 @@
<!-- 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>