diff options
| author | Michael Kolb <kolby@google.com> | 2013-04-15 20:27:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-15 20:27:46 +0000 |
| commit | d0089b2d453acd2d6d8ec240b0e9fd6a4e139cd3 (patch) | |
| tree | 2e4f926c24830ca2a9fa37a5262fcf147cb3cc1d /res | |
| parent | b96e5360397dcc0435f78993ab03c1b7fe21b028 (diff) | |
| parent | 1ec05e293169416dd369f2df78d3af2df5fd392f (diff) | |
| download | android_packages_apps_Snap-d0089b2d453acd2d6d8ec240b0e9fd6a4e139cd3.tar.gz android_packages_apps_Snap-d0089b2d453acd2d6d8ec240b0e9fd6a4e139cd3.tar.bz2 android_packages_apps_Snap-d0089b2d453acd2d6d8ec240b0e9fd6a4e139cd3.zip | |
Merge "Also, add labels to video menu" into gb-ub-photos-bryce
Diffstat (limited to 'res')
| -rw-r--r-- | res/xml/video_preferences.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml index d0671ebdb..a5d9fc8a0 100644 --- a/res/xml/video_preferences.xml +++ b/res/xml/video_preferences.xml @@ -37,6 +37,7 @@ camera:icons="@array/video_flashmode_icons" camera:largeIcons="@array/video_flashmode_largeicons" camera:entries="@array/pref_camera_video_flashmode_entries" + camera:labels="@array/pref_camera_video_flashmode_labels" camera:entryValues="@array/pref_camera_video_flashmode_entryvalues"/> <IconListPreference camera:key="pref_camera_whitebalance_key" @@ -45,6 +46,7 @@ camera:icons="@array/whitebalance_icons" camera:largeIcons="@array/whitebalance_largeicons" camera:entries="@array/pref_camera_whitebalance_entries" + camera:labels="@array/pref_camera_whitebalance_labels" camera:entryValues="@array/pref_camera_whitebalance_entryvalues"/> <IconListPreference camera:key="pref_camera_id_key" @@ -52,6 +54,7 @@ camera:title="@string/pref_camera_id_title" camera:icons="@array/camera_id_icons" camera:entries="@array/camera_id_entries" + camera:labels="@array/camera_id_labels" camera:largeIcons="@array/camera_id_largeicons"/> <IconListPreference camera:key="pref_video_effect_key" |