diff options
| author | Brint E. Kriebel <bekit@cyngn.com> | 2014-11-03 19:07:51 -0800 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-11-03 19:07:51 -0800 |
| commit | a96c64c80dfa1180fef0e4e5e11379cef029f602 (patch) | |
| tree | 12e0e78eb9abae2b30fc1fa6cd1b2b005193e8bf /res/xml/video_preferences.xml | |
| parent | 3566d8289d9d70b4581c170f01544011054dd514 (diff) | |
| parent | f19adb54a1dc0103751f581772983ef77a357457 (diff) | |
| download | android_packages_apps_Camera2-a96c64c80dfa1180fef0e4e5e11379cef029f602.tar.gz android_packages_apps_Camera2-a96c64c80dfa1180fef0e4e5e11379cef029f602.tar.bz2 android_packages_apps_Camera2-a96c64c80dfa1180fef0e4e5e11379cef029f602.zip | |
Merge branch 'cm-11.0' into stable/cm-11.0
Conflicts:
res/values-az/cm_strings.xml
res/values-in/cm_strings.xml
res/values-it/cm_strings.xml
res/values-iw/cm_strings.xml
res/values-ku/qcomstrings.xml
res/values-nb/cm_strings.xml
res/values-pl/cm_strings.xml
res/values-sk/cm_strings.xml
res/values-th/cm_strings.xml
res/values/qcomarrays.xml
res/values/qcomstrings.xml
Change-Id: Ib4294c621052fdd02ba3ab715deda052432d2fd0
Diffstat (limited to 'res/xml/video_preferences.xml')
| -rw-r--r-- | res/xml/video_preferences.xml | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml index 7f73aa5d3..9270187d9 100644 --- a/res/xml/video_preferences.xml +++ b/res/xml/video_preferences.xml @@ -20,6 +20,7 @@ <ListPreference camera:key="pref_video_quality_key" camera:title="@string/pref_video_quality_title" + camera:icon="@drawable/ic_imagesize" camera:entries="@array/pref_video_quality_entries" camera:entryValues="@array/pref_video_quality_entryvalues"/> <ListPreference @@ -35,12 +36,6 @@ camera:entries="@array/pref_camera_audioencoder_entries" camera:entryValues="@array/pref_camera_audioencoder_entryvalues" /> <ListPreference - camera:key="pref_camera_video_duration_key" - camera:defaultValue="@string/pref_camera_video_duration_default" - camera:title="@string/pref_camera_video_duration_title" - camera:entries="@array/pref_camera_video_duration_entries" - camera:entryValues="@array/pref_camera_video_duration_entryvalues" /> - <ListPreference camera:key="pref_camera_storage_key" camera:title="@string/pref_camera_storage_title" /> <IconListPreference @@ -113,6 +108,7 @@ camera:key="pref_camera_video_coloreffect_key" camera:defaultValue="@string/pref_camera_coloreffect_default" camera:title="@string/pref_camera_coloreffect_title" + camera:icon="@drawable/ic_tint" camera:entries="@array/pref_camera_coloreffect_entries" camera:entryValues="@array/pref_camera_coloreffect_entryvalues" /> <ListPreference @@ -151,4 +147,10 @@ camera:title="@string/pref_camera_power_shutter_title" camera:entries="@array/pref_switch_entries" camera:entryValues="@array/pref_switch_entryvalues" /> + <ListPreference + camera:key="pref_max_brightness" + camera:defaultValue="@string/pref_camera_max_brightness_default" + camera:title="@string/pref_camera_max_brightness_title" + camera:entries="@array/pref_switch_entries" + camera:entryValues="@array/pref_switch_entryvalues" /> </PreferenceGroup> |