diff options
Diffstat (limited to 'res/xml/camera_preferences.xml')
-rw-r--r-- | res/xml/camera_preferences.xml | 41 |
1 files changed, 27 insertions, 14 deletions
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index 39c54daa7..c9008c3a7 100644 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -25,17 +25,19 @@ camera:largeIcons="@array/camera_flashmode_largeicons" camera:entries="@array/pref_camera_flashmode_entries" camera:entryValues="@array/pref_camera_flashmode_entryvalues" - camera:labelList="@array/pref_camera_flashmode_labels" /> + camera:labelList="@array/pref_camera_flashmode_labels" + camera:singleIcon="@drawable/ic_settings_flash" /> <IconListPreference camera:key="pref_camera_exposure_key" camera:defaultValue="@string/pref_exposure_default" camera:title="@string/pref_exposure_title" - camera:singleIcon="@drawable/ic_exposure_holo_light" /> + camera:singleIcon="@drawable/ic_settings_exposure" /> <IconListPreference camera:key="pref_camera_scenemode_key" camera:defaultValue="@string/pref_camera_scenemode_default" camera:title="@string/pref_camera_scenemode_title" - camera:singleIcon="@drawable/ic_sce" + camera:singleIcon="@drawable/ic_settings_scenemode" + camera:thumbnails="@array/scenemode_thumbnails" camera:entries="@array/pref_camera_scenemode_entries" camera:entryValues="@array/pref_camera_scenemode_entryvalues" /> <IconListPreference @@ -43,6 +45,7 @@ camera:defaultValue="@string/pref_camera_whitebalance_default" camera:title="@string/pref_camera_whitebalance_title" camera:icons="@array/whitebalance_icons" + camera:singleIcon="@drawable/ic_settings_lightsource" camera:largeIcons="@array/whitebalance_largeicons" camera:entries="@array/pref_camera_whitebalance_entries" camera:entryValues="@array/pref_camera_whitebalance_entryvalues" @@ -52,19 +55,22 @@ camera:defaultValue="@string/pref_camera_recordlocation_default" camera:title="@string/pref_camera_recordlocation_title" camera:icons="@array/camera_recordlocation_icons" + camera:singleIcon="@drawable/ic_settings_location" 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 + <IconListPreference camera:key="pref_camera_picturesize_key" + camera:singleIcon="@drawable/ic_settings_picturesize" camera:title="@string/pref_camera_picturesize_title" camera:entries="@array/pref_camera_picturesize_entries" camera:entryValues="@array/pref_camera_picturesize_entryvalues" /> - <ListPreference + <IconListPreference camera:key="pref_camera_focusmode_key" camera:defaultValue="@array/pref_camera_focusmode_default_array" camera:title="@string/pref_camera_focusmode_title" + camera:singleIcon="@drawable/ic_settings_focus" camera:entries="@array/pref_camera_focusmode_entries" camera:labelList="@array/pref_camera_focusmode_labels" camera:entryValues="@array/pref_camera_focusmode_entryvalues" /> @@ -115,6 +121,7 @@ <CountDownTimerPreference camera:key="pref_camera_timer_key" camera:defaultValue="@string/pref_camera_timer_default" + camera:singleIcon="@drawable/ic_settings_countdowntimer" camera:title="@string/pref_camera_timer_title" /> <ListPreference camera:key="pref_camera_timer_sound_key" @@ -134,16 +141,19 @@ camera:title="@string/pref_camera_facerc_title" camera:entries="@array/pref_camera_facerc_entries" camera:entryValues="@array/pref_camera_facerc_entryvalues" /> - <ListPreference + <IconListPreference 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:thumbnails="@array/coloreffect_thumbnails" + camera:singleIcon="@drawable/ic_settings_filter" camera:entryValues="@array/pref_camera_coloreffect_entryvalues" /> - <ListPreference + <IconListPreference camera:key="pref_camera_jpegquality_key" camera:defaultValue="@string/pref_camera_jpegquality_default" camera:title="@string/pref_camera_jpegquality_title" + camera:singleIcon="@drawable/ic_settings_quality" camera:entries="@array/pref_camera_jpegquality_entries" camera:entryValues="@array/pref_camera_jpegquality_entryvalues" /> <ListPreference @@ -152,11 +162,12 @@ camera:title="@string/pref_camera_touchafaec_title" camera:entries="@array/pref_camera_touchafaec_entries" camera:entryValues="@array/pref_camera_touchafaec_entryvalues" /> - <ListPreference + <IconListPreference camera:key="pref_camera_iso_key" camera:defaultValue="@string/pref_camera_iso_default" camera:title="@string/pref_camera_iso_title" camera:entries="@array/pref_camera_iso_entries" + camera:singleIcon="@drawable/ic_settings_iso" camera:entryValues="@array/pref_camera_iso_entryvalues" /> <ListPreference camera:key="pref_camera_histogram_key" @@ -212,17 +223,19 @@ camera:title="@string/pref_camera_skinToneEnhancement_title" camera:entries="@array/pref_camera_skinToneEnhancement_entries" camera:entryValues="@array/pref_camera_skinToneEnhancement_entryvalues" /> - <ListPreference + <IconListPreference camera:key="pref_camera_facedetection_key" camera:defaultValue="@string/pref_camera_facedetection_default" camera:title="@string/pref_camera_facedetection_title" camera:entries="@array/pref_camera_facedetection_entries" + camera:singleIcon="@drawable/ic_settings_facerec" camera:entryValues="@array/pref_camera_facedetection_entryvalues" /> - <ListPreference + <IconListPreference camera:key="pref_camera_redeyereduction_key" camera:defaultValue="@string/pref_camera_redeyereduction_default" camera:title="@string/pref_camera_redeyereduction_title" camera:entries="@array/pref_camera_redeyereduction_entries" + camera:singleIcon="@drawable/ic_settings_redeye" camera:entryValues="@array/pref_camera_redeyereduction_entryvalues" /> <ListPreference camera:key="pref_camera_selectablezoneaf_key" @@ -236,11 +249,12 @@ camera:title="@string/pref_camera_zsl_title" camera:entries="@array/pref_camera_zsl_entries" camera:entryValues="@array/pref_camera_zsl_entryvalues" /> - <ListPreference + <IconListPreference camera:key="pref_camera_savepath_key" camera:defaultValue="@string/pref_camera_savepath_default" camera:title="@string/pref_camera_savepath_title" camera:entries="@array/pref_camera_savepath_entries" + camera:singleIcon="@drawable/ic_settings_storage" camera:entryValues="@array/pref_camera_savepath_entryvalues" /> <ListPreference camera:key="pref_camera_videosnapsize_key" @@ -254,14 +268,13 @@ camera:title="@string/pref_camera_advanced_features_title" camera:entries="@array/pref_camera_advanced_features_entries" camera:entryValues="@array/pref_camera_advanced_features_entryvalues" /> - - <ListPreference + <IconListPreference camera:key="pref_camera_longshot_key" camera:title="@string/pref_camera_longshot_title" camera:defaultValue="@string/pref_camera_longshot_default" camera:entries="@array/pref_camera_longshot_entries" + camera:singleIcon="@drawable/ic_settings_continuous" camera:entryValues="@array/pref_camera_longshot_entryvalues" /> - <ListPreference camera:key="pref_camera_auto_hdr_key" camera:defaultValue="@string/pref_camera_auto_hdr_default" |