summaryrefslogtreecommitdiffstats
path: root/res/xml/video_preferences.xml
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2013-04-18 10:15:40 -0700
committerGeorge Mount <mount@google.com>2013-04-18 10:15:40 -0700
commitf8602430548c07a35b91f16b134bb0fcc007cbbe (patch)
tree810b44caa3b0cf6c7cdc5e687a949ebd0f8af36d /res/xml/video_preferences.xml
parent673f7408a381705db18e87243755e5ec19247290 (diff)
downloadandroid_packages_apps_Snap-f8602430548c07a35b91f16b134bb0fcc007cbbe.tar.gz
android_packages_apps_Snap-f8602430548c07a35b91f16b134bb0fcc007cbbe.tar.bz2
android_packages_apps_Snap-f8602430548c07a35b91f16b134bb0fcc007cbbe.zip
Change labels so that it doesn't clash with PanoUiLib.
Bug 8401273 PanoUiLib is required for all Gallery Wolfie UI. Change-Id: Icd58c5f4c03945c29f6bf3be286d2321abf2f63a
Diffstat (limited to 'res/xml/video_preferences.xml')
-rw-r--r--res/xml/video_preferences.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index a5d9fc8a0..faf5f655b 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -37,7 +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:labelList="@array/pref_camera_video_flashmode_labels"
camera:entryValues="@array/pref_camera_video_flashmode_entryvalues"/>
<IconListPreference
camera:key="pref_camera_whitebalance_key"
@@ -46,7 +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:labelList="@array/pref_camera_whitebalance_labels"
camera:entryValues="@array/pref_camera_whitebalance_entryvalues"/>
<IconListPreference
camera:key="pref_camera_id_key"
@@ -54,7 +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:labelList="@array/camera_id_labels"
camera:largeIcons="@array/camera_id_largeicons"/>
<IconListPreference
camera:key="pref_video_effect_key"