summaryrefslogtreecommitdiffstats
path: root/res/xml/camera_preferences.xml
diff options
context:
space:
mode:
Diffstat (limited to 'res/xml/camera_preferences.xml')
-rwxr-xr-xres/xml/camera_preferences.xml30
1 files changed, 17 insertions, 13 deletions
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index 68d6d3148..e71137123 100755
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -79,10 +79,11 @@
camera:entries="@array/pref_camera_focusmode_entries"
camera:labelList="@array/pref_camera_focusmode_labels"
camera:entryValues="@array/pref_camera_focusmode_entryvalues" />
- <ListPreference
+ <IconListPreference
camera:key="pref_camera_focustime_key"
camera:defaultValue="@string/pref_camera_focustime_default"
camera:title="@string/pref_camera_focustime_title"
+ camera:singleIcon="@drawable/ic_settings_focus_time"
camera:entries="@array/pref_camera_focustime_duration_entries"
camera:entryValues="@array/pref_camera_focustime_duration_values" />
<ListPreference
@@ -256,7 +257,7 @@
camera:defaultValue="@string/pref_camera_tsmakeup_default"
camera:title="@string/pref_camera_tsmakeup_title"
camera:entries="@array/pref_camera_tsmakeup_entries"
- camera:singleIcon="@drawable/ic_ts_makeup_off"
+ camera:singleIcon="@drawable/ic_settings_beutification"
camera:icons="@array/pref_ts_makeup_icons"
camera:largeIcons="@array/pref_ts_makeup_icons"
camera:entryValues="@array/pref_camera_tsmakeup_entryvalues" />
@@ -266,16 +267,18 @@
camera:title="@string/pref_camera_tsmakeup_title"
camera:entries="@array/pref_camera_tsmakeup_level_entries"
camera:thumbnails="@array/tsmakeup_level_thumbnails"
- camera:singleIcon="@drawable/ic_ts_makeup_off"
+ camera:singleIcon="@drawable/ic_settings_beutification"
camera:entryValues="@array/pref_camera_tsmakeup_level_entryvalues" />
- <ListPreference
+ <IconListPreference
camera:key="pref_camera_tsmakeup_whiten"
camera:defaultValue="@string/pref_camera_tsmakeup_level_default"
- camera:title="@string/pref_camera_tsmakeup_title" />
- <ListPreference
+ camera:title="@string/pref_camera_tsmakeup_title"
+ camera:singleIcon="@drawable/ic_settings_beutification" />
+ <IconListPreference
camera:key="pref_camera_tsmakeup_clean"
camera:defaultValue="@string/pref_camera_tsmakeup_level_default"
- camera:title="@string/pref_camera_tsmakeup_title" />
+ camera:title="@string/pref_camera_tsmakeup_title"
+ camera:singleIcon="@drawable/ic_settings_beutification" />
<IconListPreference
camera:key="pref_camera_redeyereduction_key"
camera:defaultValue="@string/pref_camera_redeyereduction_default"
@@ -371,7 +374,7 @@
camera:entries="@array/pref_camera_manual_focus_entries"
camera:entryValues="@array/pref_camera_manual_focus_entry_values" />
- <ListPreference
+ <IconListPreference
camera:key="pref_camera_instant_capture_key"
camera:defaultValue="@string/pref_camera_instant_capture_default"
camera:title="@string/pref_camera_instant_capture_title"
@@ -385,20 +388,20 @@
camera:entries="@array/pref_camera_bokeh_mode_entries"
camera:entryValues="@array/pref_camera_bokeh_mode_entry_values" />
- <ListPreference
+ <IconListPreference
camera:key="pref_camera_bokeh_mpo_key"
camera:defaultValue="@string/pref_camera_bokeh_mpo_default"
camera:title="@string/pref_camera_bokeh_mpo_title"
camera:entries="@array/pref_camera_bokeh_mpo_entries"
camera:entryValues="@array/pref_camera_bokeh_mpo_entry_values" />
- <ListPreference
+ <IconListPreference
camera:key="pref_camera_bokeh_blur_degree_key"
camera:defaultValue="@string/pref_camera_bokeh_blur_degree_default"
camera:title="@string/pref_camera_bokeh_blur_degree_title"/>
- <ListPreference
+ <IconListPreference
camera:key="pref_camera2_camera2_key"
camera:defaultValue="@string/setting_off_value"
camera:title="@string/pref_camera2_camera2_title"
@@ -413,17 +416,18 @@
camera:singleIcon="@drawable/ic_settings_countdowntimer"
camera:entryValues="@array/pref_camera_shutter_speed_entryvalues" />
- <ListPreference
+ <IconListPreference
camera:key="pref_camera_zoom_key"
camera:defaultValue="@string/pref_camera_zoom_default"
camera:title="@string/pref_camera_zoom_title"
camera:entries="@array/pref_camera_zoom_entries"
camera:entryValues="@array/pref_camera_zoom_entryvalues" />
- <ListPreference
+ <IconListPreference
camera:key="pref_power_shutter"
camera:defaultValue="@string/pref_camera_power_shutter_default"
camera:title="@string/pref_camera_power_shutter_title"
+ camera:singleIcon="@drawable/ic_settings_powershutter"
camera:entries="@array/pref_switch_entries"
camera:entryValues="@array/pref_switch_entryvalues" />
<IconListPreference