diff options
| author | Alok Kediya <kediya@codeaurora.org> | 2013-09-28 18:23:26 +0530 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2013-10-31 19:39:50 -0600 |
| commit | e57357e650a7fd65b9f8de3b64cdd0cd28f66b58 (patch) | |
| tree | e0ff80593886025cd7b013753142b77e8684bed5 /res/xml/video_preferences.xml | |
| parent | 6aebaa5e9af89581c5d07fef27c1a17e127673f9 (diff) | |
| download | android_packages_apps_Snap-e57357e650a7fd65b9f8de3b64cdd0cd28f66b58.tar.gz android_packages_apps_Snap-e57357e650a7fd65b9f8de3b64cdd0cd28f66b58.tar.bz2 android_packages_apps_Snap-e57357e650a7fd65b9f8de3b64cdd0cd28f66b58.zip | |
Camera: Add support for setting DIS
- This patch allows the CamCorder client to
configure DIS from the UI menu. Supported modes
by the camera are parsed and dynamically filtered.
(cherry picked from commit 24513b0af17e514aa24100c908432c115a1ddcda)
Change-Id: I7aaacc883eec9d1b91f549d8e76d96f4a6940aed
Conflicts:
src/com/android/camera/CameraSettings.java
(cherry picked from commit 1278c225500065e8448ad0ea2c6f50abefc5e884)
(cherry picked from commit e093b0988c3c4b5ece6ea7ad5f79796705cd4b21)
Diffstat (limited to 'res/xml/video_preferences.xml')
| -rw-r--r-- | res/xml/video_preferences.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml index af9e8501b..ab876b81c 100644 --- a/res/xml/video_preferences.xml +++ b/res/xml/video_preferences.xml @@ -97,6 +97,12 @@ camera:entries="@array/pref_camera_powermode_entries" camera:entryValues="@array/pref_camera_powermode_entryvalues" /> <ListPreference + camera:key="pref_camera_dis_key" + camera:defaultValue="@string/pref_camera_dis_default" + camera:title="@string/pref_camera_dis_title" + camera:entries="@array/pref_camera_dis_entries" + camera:entryValues="@array/pref_camera_dis_entryvalues" /> + <ListPreference camera:key="pref_camera_coloreffect_key" camera:defaultValue="@string/pref_camera_coloreffect_default" camera:title="@string/pref_camera_coloreffect_title" |