diff options
| author | Michael Kolb <kolby@google.com> | 2013-04-18 12:31:10 -0700 |
|---|---|---|
| committer | Michael Kolb <kolby@google.com> | 2013-04-18 14:31:18 -0700 |
| commit | b4524a16022b35d1c76dfb8580d83f7fdd91dc36 (patch) | |
| tree | fa2d388ca4e74fc666331d686d49a1df153bad63 /res/xml/camera_preferences.xml | |
| parent | 06fe6accb6abb284b77acd66e8db98421024b99b (diff) | |
| download | android_packages_apps_Snap-b4524a16022b35d1c76dfb8580d83f7fdd91dc36.tar.gz android_packages_apps_Snap-b4524a16022b35d1c76dfb8580d83f7fdd91dc36.tar.bz2 android_packages_apps_Snap-b4524a16022b35d1c76dfb8580d83f7fdd91dc36.zip | |
Add more menu options/icons
Bug: 8640131
Added location and scene mode to secondary menu
Updated HDR icons
Change-Id: I5bed39a2ec037aecf67702d88f738befe61846d4
Diffstat (limited to 'res/xml/camera_preferences.xml')
| -rw-r--r-- | res/xml/camera_preferences.xml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index 4764cd375..8c13a3422 100644 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -35,8 +35,11 @@ camera:key="pref_camera_scenemode_key" camera:defaultValue="@string/pref_camera_scenemode_default" camera:title="@string/pref_camera_scenemode_title" - camera:singleIcon="@drawable/ic_scn_holo_light" + camera:singleIcon="@drawable/ic_sce" camera:entries="@array/pref_camera_scenemode_entries" + camera:labelList="@array/pref_camera_scenemode_labels" + camera:icons="@array/pref_camera_scenemode_icons" + camera:largeIcons="@array/pref_camera_scenemode_icons" camera:entryValues="@array/pref_camera_scenemode_entryvalues" /> <IconListPreference camera:key="pref_camera_whitebalance_key" @@ -54,6 +57,7 @@ camera:icons="@array/camera_recordlocation_icons" camera:largeIcons="@array/camera_recordlocation_largeicons" camera:entries="@array/pref_camera_recordlocation_entries" + camera:labelList="@array/pref_camera_recordlocation_labels" camera:entryValues="@array/pref_camera_recordlocation_entryvalues" /> <ListPreference camera:key="pref_camera_picturesize_key" @@ -75,11 +79,13 @@ camera:entries="@array/camera_id_entries" camera:labelList="@array/camera_id_labels" camera:largeIcons="@array/camera_id_largeicons" /> - <ListPreference + <IconListPreference camera:key="pref_camera_hdr_key" camera:defaultValue="@string/pref_camera_hdr_default" camera:title="@string/pref_camera_scenemode_entry_hdr" camera:entries="@array/pref_camera_hdr_entries" + camera:icons="@array/pref_camera_hdr_icons" + camera:largeIcons="@array/pref_camera_hdr_icons" camera:labelList="@array/pref_camera_hdr_labels" camera:entryValues="@array/pref_camera_hdr_entryvalues" /> <CountDownTimerPreference |