diff options
author | Alok Kediya <kediya@codeaurora.org> | 2013-09-28 16:23:35 +0530 |
---|---|---|
committer | Linux Build Service Account <lnxbuild@localhost> | 2013-10-31 19:39:24 -0600 |
commit | c862c8b5005e9325acc3f7511cb6136e7b77f720 (patch) | |
tree | ae7990832322dbeb98b8e405a08da09986f14a50 /res/xml | |
parent | e111d53de4f9b40ef024deb8af7a0dc0f20e5398 (diff) | |
download | android_packages_apps_Snap-c862c8b5005e9325acc3f7511cb6136e7b77f720.tar.gz android_packages_apps_Snap-c862c8b5005e9325acc3f7511cb6136e7b77f720.tar.bz2 android_packages_apps_Snap-c862c8b5005e9325acc3f7511cb6136e7b77f720.zip |
Camera: Add support for setting AE Bracketing.
- This modification re-enables the AE bracketing UI
option and adds the necessary logic for parsing
and filtering the supported AE bracketing modes by
the camera.
(cherrypicked from commit 0b2b18f2a6b89da004db8c36420fc61f0e884290)
Change-Id: I5aea466eed9a3de4a899cced1e03c5177e57104b
Conflicts:
src/com/android/camera/CameraSettings.java
Conflicts:
src/com/android/camera/CameraSettings.java
(cherry picked from commit 8cd8e6797ed3ce856bb4d7771085e1678bea7f25)
(cherry picked from commit 24b84fd5855235b8710a625e42a0f2879cc1d898)
Diffstat (limited to 'res/xml')
-rw-r--r-- | res/xml/camera_preferences.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index 558194fc0..36165abc0 100644 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -68,6 +68,12 @@ camera:entries="@array/pref_camera_focusmode_entries" camera:labelList="@array/pref_camera_focusmode_labels" camera:entryValues="@array/pref_camera_focusmode_entryvalues" /> + <ListPreference + camera:key="pref_camera_ae_bracket_hdr_key" + camera:defaultValue="@string/pref_camera_ae_bracket_hdr_default" + camera:title="@string/pref_camera_ae_bracket_hdr_title" + camera:entries="@array/pref_camera_ae_bracket_hdr_entries" + camera:entryValues="@array/pref_camera_ae_bracket_hdr_entryvalues" /> <IconListPreference camera:key="pref_camera_id_key" camera:defaultValue="@string/pref_camera_id_default" |