summaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-09-19 11:59:46 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2014-09-19 11:59:46 -0700
commit81b91551dfd0f35380094e3434e5358e8d63f0ba (patch)
tree3202b70814559f43b7c53427a718c296602075a4 /res/xml
parent0fa36eae91e743e85f2942407e6b686cb38ac363 (diff)
parentec449be018e9ff0f644d3484e61334a9667f82a6 (diff)
downloadandroid_packages_apps_Snap-81b91551dfd0f35380094e3434e5358e8d63f0ba.tar.gz
android_packages_apps_Snap-81b91551dfd0f35380094e3434e5358e8d63f0ba.tar.bz2
android_packages_apps_Snap-81b91551dfd0f35380094e3434e5358e8d63f0ba.zip
Merge "SnapdragonCamera: Add HDR need 1x menu selection"
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/camera_preferences.xml7
1 files changed, 7 insertions, 0 deletions
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index ab1e340f8..d7f245343 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -263,4 +263,11 @@
camera:title="@string/pref_camera_hdr_mode_title"
camera:entries="@array/pref_camera_hdr_mode_entries"
camera:entryValues="@array/pref_camera_hdr_mode_entryvalues" />
+
+ <ListPreference
+ camera:key="pref_camera_hdr_need_1x_key"
+ camera:defaultValue="@string/pref_camera_hdr_need_1x_default"
+ camera:title="@string/pref_camera_hdr_need_1x_title"
+ camera:entries="@array/pref_camera_hdr_need_1x_entries"
+ camera:entryValues="@array/pref_camera_hdr_need_1x_entryvalues" />
</PreferenceGroup>