summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorFei Zhang <feizhang@codeaurora.org>2014-03-27 13:55:24 +0800
committerFei Zhang <feizhang@codeaurora.org>2014-04-14 10:16:50 +0800
commit28bcccd399442239a32ab1024b0c09c9c5a25b8c (patch)
tree5c11197e6c995154c6693a35220870b6a3822d2b /res
parentdf600cb8da69657df910206a4be68ff76a96cffa (diff)
downloadandroid_packages_apps_Snap-28bcccd399442239a32ab1024b0c09c9c5a25b8c.tar.gz
android_packages_apps_Snap-28bcccd399442239a32ab1024b0c09c9c5a25b8c.tar.bz2
android_packages_apps_Snap-28bcccd399442239a32ab1024b0c09c9c5a25b8c.zip
Camera2: add UI option to on/off longshot
Add a menu option to turn on/off longshot. Change-Id: I21b5b8e8181317dc2db5ece44a60be66a52f5d0a
Diffstat (limited to 'res')
-rw-r--r--res/values-zh-rCN/strings.xml1
-rw-r--r--res/values-zh-rTW/strings.xml1
-rw-r--r--res/values/qcomarrays.xml11
-rw-r--r--res/values/qcomstrings.xml4
-rw-r--r--res/xml/camera_preferences.xml8
5 files changed, 25 insertions, 0 deletions
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 07eceb500..c87184728 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -481,4 +481,5 @@
<string name="error_app_unsupported_raw">"RAW图片格式下不支持零秒快拍,已为您切换至JPEG格式"</string>
<string name="error_app_unsupported_hsr">当前格式下不支持HSR</string>
+ <string name="pref_camera_longshot_title">连拍</string>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 9697eec7b..46c3df368 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -292,4 +292,5 @@
<string name="cannot_load_image" msgid="4100136187076585580">"無法載入圖片!"</string>
<string name="switch_photo_filmstrip" msgid="1448511001008888767">"幻燈片檢視"</string>
<string name="setting_wallpaper" msgid="2397759659347872725">"正在設定桌布"</string>
+ <string name="pref_camera_longshot_title">連拍</string>
</resources>
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml
index 07bb7eb6c..dfdd67cd3 100644
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -579,5 +579,16 @@
<item>@string/pref_camera_advanced_feature_value_optizoom_on</item>
</string-array>
+ <!-- Camera Preferences Long Shot dialog box entries -->
+ <string-array name="pref_camera_longshot_entries" translatable="false">
+ <item>@string/setting_off</item>
+ <item>@string/setting_on</item>
+ </string-array>
+
+ <string-array name="pref_camera_longshot_entryvalues" translatable="false">
+ <item>@string/setting_off_value</item>
+ <item>@string/setting_on_value</item>
+ </string-array>
+
</resources>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index a55623dae..cd089a2ce 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -651,5 +651,9 @@
<string name="time_lapse_error">Invalid video-size for time-lapse recording.</string>
<string name="pref_camera_videosnapsize_default" translatable="false">1920x1080</string>
+
+ <!-- longshot value -->
+ <string name="pref_camera_longshot_default" translatable="false">off</string>
+ <string name="pref_camera_longshot_title">Continuous Shot</string>
</resources>
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index c3afedecf..db56927a7 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -242,4 +242,12 @@
camera:title="@string/pref_camera_advanced_features_title"
camera:entries="@array/pref_camera_advanced_features_entries"
camera:entryValues="@array/pref_camera_advanced_features_entryvalues" />
+
+ <ListPreference
+ camera:key="pref_camera_longshot_key"
+ camera:title="@string/pref_camera_longshot_title"
+ camera:defaultValue="@string/pref_camera_longshot_default"
+ camera:entries="@array/pref_camera_longshot_entries"
+ camera:entryValues="@array/pref_camera_longshot_entryvalues" />
+
</PreferenceGroup>