summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorByunghun Jeon <bjeon@codeaurora.org>2015-11-17 14:20:30 -0800
committerJay Wang <jaywang@codeaurora.org>2016-03-30 15:54:11 -0700
commit3618eb79912c36216b197580e54e366ab19d2a61 (patch)
treed3157d73b7a15382a5562e25e6cb72f073228835 /res/values
parentbdabec40fc13076c07fba8bb5d04a104cab2ddce (diff)
downloadandroid_packages_apps_Snap-3618eb79912c36216b197580e54e366ab19d2a61.tar.gz
android_packages_apps_Snap-3618eb79912c36216b197580e54e366ab19d2a61.tar.bz2
android_packages_apps_Snap-3618eb79912c36216b197580e54e366ab19d2a61.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 c4c7be482..a4c463735 100644
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -841,5 +841,27 @@
<item>@string/pref_camera_instant_capture_value_enable</item>
<item>@string/pref_camera_instant_capture_value_disable</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 e724dbb8c..0e21bb5e6 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -944,5 +944,24 @@
<string name="help_menu_switcher_1" translatable="true">Switch</string>
<string name="help_menu_switcher_2" translatable="true">between</string>
<string name="help_menu_switcher_3" translatable="true">camera, video, and panorama</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>
</resources>