diff options
| author | Alok Kediya <kediya@codeaurora.org> | 2013-09-27 20:22:45 +0530 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2013-10-31 19:39:18 -0600 |
| commit | 0dc64ffddb06d0b41e65f10c742caec52e8b0436 (patch) | |
| tree | 43344ecae06fa3aa8b2384d6208175f514965017 /res/xml/video_preferences.xml | |
| parent | 5213f27da56b6b1ff989ea9eda28bac7dce720b5 (diff) | |
| download | android_packages_apps_Snap-0dc64ffddb06d0b41e65f10c742caec52e8b0436.tar.gz android_packages_apps_Snap-0dc64ffddb06d0b41e65f10c742caec52e8b0436.tar.bz2 android_packages_apps_Snap-0dc64ffddb06d0b41e65f10c742caec52e8b0436.zip | |
Camera : Enable camera and camcorder UI features..
Added keys and APIs for enabling QC features from UI.
(cherry picked from commit a0fdd6924374635711ea6a554f3a59a087cf4b21)
Change-Id: Id50b7cebe2d33eaf7bb6a8e51fecded50ac6dcf8
Conflicts:
src/com/android/camera/CameraSettings.java
src/com/android/camera/PhotoMenu.java
src/com/android/camera/PhotoModule.java
src/com/android/camera/VideoModule.java
Conflicts:
src/com/android/camera/CameraSettings.java
src/com/android/camera/VideoModule.java
(cherry picked from commit 93cd1cdb59449ccb2b9594c9d8e3978a25d7f376)
(cherry picked from commit af04f9d621183addee0f7cdd7c1a41c8d0e65cfe)
Diffstat (limited to 'res/xml/video_preferences.xml')
| -rw-r--r-- | res/xml/video_preferences.xml | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml index 08dbc0039..8fecb7116 100644 --- a/res/xml/video_preferences.xml +++ b/res/xml/video_preferences.xml @@ -90,4 +90,28 @@ camera:largeIcons="@array/camera_recordlocation_largeicons" camera:entries="@array/pref_camera_recordlocation_entries" camera:entryValues="@array/pref_camera_recordlocation_entryvalues" /> + <ListPreference + camera:key="pref_camera_powermode_key" + camera:defaultValue="@string/pref_camera_powermode_default" + camera:title="@string/pref_camera_powermode_title" + camera:entries="@array/pref_camera_powermode_entries" + camera:entryValues="@array/pref_camera_powermode_entryvalues" /> + <ListPreference + camera:key="pref_camera_coloreffect_key" + camera:defaultValue="@string/pref_camera_coloreffect_default" + camera:title="@string/pref_camera_coloreffect_title" + camera:entries="@array/pref_camera_coloreffect_entries" + camera:entryValues="@array/pref_camera_coloreffect_entryvalues" /> + <ListPreference + camera:key="pref_camera_hfr_key" + camera:defaultValue="@string/pref_camera_hfr_default" + camera:title="@string/pref_camera_hfr_title" + camera:entries="@array/pref_camera_hfr_entries" + camera:entryValues="@array/pref_camera_hfr_entryvalues"/> + <ListPreference + camera:key="pref_camera_videosnapsize_key" + camera:defaultValue="@string/pref_camera_videosnapsize_default" + camera:title="@string/pref_camera_picturesize_title" + camera:entries="@array/pref_camera_picturesize_entries" + camera:entryValues="@array/pref_camera_picturesize_entryvalues" /> </PreferenceGroup> |