Snap: Add icons to all remaining preferences

Change-Id: I0a06b550ae4137d0e665947d8a8574c3b26fcb95
Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>

2 files changed, 68 insertions, 39 deletions

diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index 1f5077296..857bbac11 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -26,7 +26,7 @@
             camera:entries="@array/pref_camera_flashmode_entries"
             camera:entryValues="@array/pref_camera_flashmode_entryvalues"
             camera:labelList="@array/pref_camera_flashmode_labels"
-            camera:singleIcon="@drawable/ic_settings_flash" />
+            camera:singleIcon="@drawable/ic_flash_on" />
     <IconListPreference
             camera:key="pref_camera_exposure_key"
             camera:defaultValue="@string/pref_exposure_default"
@@ -81,29 +81,32 @@
             camera:entries="@array/pref_camera_focusmode_entries"
             camera:labelList="@array/pref_camera_focusmode_labels"
             camera:entryValues="@array/pref_camera_focusmode_entryvalues" />
-     <IconListPreference
+    <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
+    <IconListPreference
             camera:key="pref_camera_ae_bracket_hdr_key"
             camera:defaultValue="@string/pref_camera_ae_bracket_hdr_default"
             camera:title="@string/pref_camera_ae_bracket_hdr_title"
+            camera:singleIcon="@drawable/ic_settings_ae"
             camera:entries="@array/pref_camera_ae_bracket_hdr_entries"
             camera:entryValues="@array/pref_camera_ae_bracket_hdr_entryvalues" />
-     <ListPreference
+    <IconListPreference
             camera:key="pref_camera_cds_mode_key"
             camera:defaultValue="@string/pref_camera_cds_default"
             camera:title="@string/pref_camera_cds_title"
+            camera:singleIcon="@drawable/ic_settings_cds"
             camera:entries="@array/pref_camera_cds_entries"
             camera:entryValues="@array/pref_camera_cds_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_tnr_mode_key"
             camera:defaultValue="@string/pref_camera_tnr_default"
             camera:title="@string/pref_camera_tnr_title"
+            camera:singleIcon="@drawable/ic_settings_tnr"
             camera:entries="@array/pref_camera_tnr_entries"
             camera:entryValues="@array/pref_camera_tnr_entryvalues" />
     <IconListPreference
@@ -137,22 +140,25 @@
             camera:defaultValue="@string/pref_camera_timer_default"
             camera:singleIcon="@drawable/ic_settings_countdowntimer"
             camera:title="@string/pref_camera_timer_title" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_timer_sound_key"
             camera:defaultValue="@string/pref_camera_timer_sound_default"
             camera:title="@string/pref_camera_timer_sound_title"
+            camera:singleIcon="@drawable/ic_settings_sound"
             camera:entries="@array/pref_camera_timer_sound_entries"
             camera:entryValues="@array/pref_camera_timer_sound_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_scenedetect_key"
             camera:defaultValue="@string/pref_camera_scenedetect_default"
             camera:title="@string/pref_camera_scenedetect_title"
+            camera:singleIcon="@drawable/ic_sce"
             camera:entries="@array/pref_camera_scenedetect_entries"
             camera:entryValues="@array/pref_camera_scenedetect_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_facerc_key"
             camera:defaultValue="@string/pref_camera_facerc_default"
             camera:title="@string/pref_camera_facerc_title"
+            camera:singleIcon="@drawable/ic_settings_facerec"
             camera:entries="@array/pref_camera_facerc_entries"
             camera:entryValues="@array/pref_camera_facerc_entryvalues" />
     <IconListPreference
@@ -192,58 +198,67 @@
             camera:entries="@array/pref_camera_iso_entries"
             camera:singleIcon="@drawable/ic_settings_iso"
             camera:entryValues="@array/pref_camera_iso_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_histogram_key"
             camera:defaultValue="@string/pref_camera_histogram_default"
             camera:title="@string/pref_camera_histogram_title"
+            camera:singleIcon="@drawable/ic_settings_histogram"
             camera:entries="@array/pref_camera_histogram_entries"
             camera:entryValues="@array/pref_camera_histogram_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_antibanding_key"
             camera:defaultValue="@string/pref_camera_antibanding_default"
             camera:title="@string/pref_camera_antibanding_title"
             camera:entries="@array/pref_camera_antibanding_entries"
+            camera:singleIcon="@drawable/ic_settings_antibanding"
             camera:entryValues="@array/pref_camera_antibanding_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_pictureformat_key"
             camera:defaultValue="@string/pref_camera_picture_format_default"
             camera:title="@string/pref_camera_picture_format_title"
+            camera:singleIcon="@drawable/ic_settings_format"
             camera:entries="@array/pref_camera_picture_format_entries"
             camera:entryValues="@array/pref_camera_picture_format_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_sharpness_key"
             camera:defaultValue="@string/pref_camera_sharpness_default"
             camera:title="@string/pref_camera_sharpness_title"
+            camera:singleIcon="@drawable/ic_settings_sharpness"
             camera:entries="@array/pref_camera_sharpness_entries"
             camera:entryValues="@array/pref_camera_multilevel_sharpness_entryvalues"/>
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_contrast_key"
             camera:defaultValue="@string/pref_camera_contrast_default"
             camera:title="@string/pref_camera_contrast_title"
+            camera:singleIcon="@drawable/ic_settings_contrast"
             camera:entries="@array/pref_camera_contrast_entries"
             camera:entryValues="@array/pref_camera_multilevel_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_saturation_key"
             camera:defaultValue="@string/pref_camera_saturation_default"
             camera:title="@string/pref_camera_saturation_title"
+            camera:singleIcon="@drawable/ic_settings_saturation"
             camera:entries="@array/pref_camera_saturation_entries"
             camera:entryValues="@array/pref_camera_multilevel_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_denoise_key"
             camera:defaultValue="@string/pref_camera_denoise_default"
             camera:title="@string/pref_camera_denoise_title"
+            camera:singleIcon="@drawable/ic_settings_denoise"
             camera:entries="@array/pref_camera_denoise_entries"
             camera:entryValues="@array/pref_camera_denoise_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_autoexposure_key"
             camera:defaultValue="@string/pref_camera_autoexposure_default"
             camera:title="@string/pref_camera_autoexposure_title"
             camera:entries="@array/pref_camera_autoexposure_entries"
+            camera:singleIcon="@drawable/ic_settings_auto_exposure"
             camera:entryValues="@array/pref_camera_autoexposure_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_skinToneEnhancement_key"
             camera:defaultValue="@string/pref_camera_skinToneEnhancement_default"
             camera:title="@string/pref_camera_skinToneEnhancement_title"
+            camera:singleIcon="@drawable/ic_settings_skin"
             camera:entries="@array/pref_camera_skinToneEnhancement_entries"
             camera:entryValues="@array/pref_camera_skinToneEnhancement_entryvalues" />
     <IconListPreference
@@ -310,12 +325,14 @@
             camera:key="pref_camera_selectablezoneaf_key"
             camera:defaultValue="@string/pref_camera_selectablezoneaf_default"
             camera:title="@string/pref_camera_selectablezoneaf_title"
+            camera:singleIcon="@drawable/ic_settings_focus_zone"
             camera:entries="@array/pref_camera_selectablezoneaf_entries"
             camera:entryValues="@array/pref_camera_selectablezoneaf_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_zsl_key"
             camera:defaultValue="@string/pref_camera_zsl_default"
             camera:title="@string/pref_camera_zsl_title"
+            camera:singleIcon="@drawable/ic_settings_zsl"
             camera:entries="@array/pref_camera_zsl_entries"
             camera:entryValues="@array/pref_camera_zsl_entryvalues" />
     <IconListPreference
@@ -325,10 +342,11 @@
             camera:entries="@array/pref_camera_savepath_entries"
             camera:singleIcon="@drawable/ic_settings_storage"
             camera:entryValues="@array/pref_camera_savepath_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_advanced_features_key"
             camera:defaultValue="@string/pref_camera_advanced_feature_default"
             camera:title="@string/pref_camera_advanced_features_title"
+            camera:singleIcon="@drawable/ic_settings_advanced"
             camera:entries="@array/pref_camera_advanced_features_entries"
             camera:entryValues="@array/pref_camera_advanced_features_entryvalues" />
     <IconListPreference
@@ -338,45 +356,46 @@
             camera:entries="@array/pref_camera_longshot_entries"
             camera:singleIcon="@drawable/ic_settings_continuous"
             camera:entryValues="@array/pref_camera_longshot_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_auto_hdr_key"
             camera:defaultValue="@string/pref_camera_auto_hdr_default"
             camera:title="@string/pref_camera_auto_hdr_title"
             camera:entries="@array/pref_camera_auto_hdr_entries"
+            camera:singleIcon="@drawable/ic_settings_hdr_auto"
             camera:entryValues="@array/pref_camera_auto_hdr_entryvalues" />
-
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_hdr_mode_key"
             camera:defaultValue="@string/pref_camera_hdr_mode_default"
             camera:title="@string/pref_camera_hdr_mode_title"
+            camera:singleIcon="@drawable/ic_hdr"
             camera:entries="@array/pref_camera_hdr_mode_entries"
             camera:entryValues="@array/pref_camera_hdr_mode_entryvalues" />
-
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_hdr_need_1x_key"
             camera:defaultValue="@string/pref_camera_hdr_need_1x_default"
             camera:title="@string/pref_camera_hdr_need_1x_title"
+            camera:singleIcon="@drawable/ic_settings_onex"
             camera:entries="@array/pref_camera_hdr_need_1x_entries"
             camera:entryValues="@array/pref_camera_hdr_need_1x_entryvalues" />
-
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_manual_exp_key"
             camera:defaultValue="@string/pref_camera_manual_exp_default"
             camera:title="@string/pref_camera_manual_exp_title"
+            camera:singleIcon="@drawable/ic_settings_manualexp"
             camera:entries="@array/pref_camera_manual_exp_entries"
             camera:entryValues="@array/pref_camera_manual_exp_entry_values" />
-
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_manual_wb_key"
             camera:defaultValue="@string/pref_camera_manual_wb_default"
             camera:title="@string/pref_camera_manual_wb_title"
+            camera:singleIcon="@drawable/ic_settings_wb"
             camera:entries="@array/pref_camera_manual_wb_entries"
             camera:entryValues="@array/pref_camera_manual_wb_entry_values" />
-
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_manual_focus_key"
             camera:defaultValue="@string/pref_camera_manual_focus_default"
             camera:title="@string/pref_camera_manual_focus_title"
+            camera:singleIcon="@drawable/ic_settings_manualfocus"
             camera:entries="@array/pref_camera_manual_focus_entries"
             camera:entryValues="@array/pref_camera_manual_focus_entry_values" />
 
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index 626779f50..a1902adfa 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -23,34 +23,39 @@
             camera:entries="@array/pref_video_quality_entries"
             camera:singleIcon="@drawable/ic_settings_quality"
             camera:entryValues="@array/pref_video_quality_entryvalues"/>
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_videoencoder_key"
             camera:defaultValue="@string/pref_camera_videoencoder_default"
             camera:title="@string/pref_camera_videoencoder_title"
+            camera:singleIcon="@drawable/ic_settings_encoder_video"
             camera:entries="@array/pref_camera_videoencoder_entries"
             camera:entryValues="@array/pref_camera_videoencoder_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_audioencoder_key"
             camera:defaultValue="@string/pref_camera_audioencoder_default"
             camera:title="@string/pref_camera_audioencoder_title"
+            camera:singleIcon="@drawable/ic_settings_encoder_audio"
             camera:entries="@array/pref_camera_audioencoder_entries"
             camera:entryValues="@array/pref_camera_audioencoder_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_video_cds_mode_key"
             camera:defaultValue="@string/pref_camera_video_cds_default"
             camera:title="@string/pref_camera_video_cds_title"
+            camera:singleIcon="@drawable/ic_settings_cds"
             camera:entries="@array/pref_camera_video_cds_entries"
             camera:entryValues="@array/pref_camera_video_cds_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_video_tnr_mode_key"
             camera:defaultValue="@string/pref_camera_video_tnr_default"
             camera:title="@string/pref_camera_video_tnr_title"
+            camera:singleIcon="@drawable/ic_settings_tnr"
             camera:entries="@array/pref_camera_video_tnr_entries"
             camera:entryValues="@array/pref_camera_video_tnr_entryvalues" />
     <IconListPreference
             camera:key="pref_video_time_lapse_frame_interval_key"
             camera:defaultValue="@string/pref_video_time_lapse_frame_interval_default"
             camera:title="@string/pref_video_time_lapse_frame_interval_title"
+            camera:singleIcon="@drawable/ic_settings_timelapse"
             camera:entries="@array/pref_video_time_lapse_frame_interval_entries"
             camera:entryValues="@array/pref_video_time_lapse_frame_interval_entryvalues"/>
     <IconListPreference
@@ -59,7 +64,7 @@
             camera:title="@string/pref_camera_flashmode_title"
             camera:icons="@array/video_flashmode_icons"
             camera:largeIcons="@array/video_flashmode_largeicons"
-            camera:singleIcon="@drawable/ic_settings_flash"
+            camera:singleIcon="@drawable/ic_flash_on"
             camera:entries="@array/pref_camera_video_flashmode_entries"
             camera:labelList="@array/pref_camera_video_flashmode_labels"
             camera:entryValues="@array/pref_camera_video_flashmode_entryvalues"/>
@@ -113,6 +118,7 @@
             camera:key="pref_camera_dis_key"
             camera:defaultValue="@string/pref_camera_dis_default"
             camera:title="@string/pref_camera_dis_title"
+            camera:singleIcon="@drawable/ic_settings_stabilization"
             camera:entries="@array/pref_camera_dis_entries"
             camera:singleIcon="@drawable/ic_eis_menu"
             camera:entryValues="@array/pref_camera_dis_entryvalues" />
@@ -153,22 +159,25 @@
             camera:title="@string/pref_camera_noise_reduction_title"
             camera:entries="@array/pref_camera_noise_reduction_entries"
             camera:entryValues="@array/pref_camera_noise_reduction_entryvalues"/>
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_see_more_key"
             camera:defaultValue="@string/pref_camera_see_more_default"
             camera:title="@string/pref_camera_see_more_title"
+            camera:singleIcon="@drawable/ic_settings_redeye"
             camera:entries="@array/pref_camera_see_more_entries"
             camera:entryValues="@array/pref_camera_see_more_entryvalues"/>
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_video_hdr_key"
             camera:defaultValue="@string/pref_camera_video_hdr_default"
             camera:title="@string/pref_camera_video_hdr_title"
+            camera:singleIcon="@drawable/ic_hdr"
             camera:entries="@array/pref_camera_video_hdr_entries"
             camera:entryValues="@array/pref_camera_video_hdr_entryvalues"/>
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_videosnapsize_key"
             camera:defaultValue="@string/pref_camera_videosnapsize_default"
             camera:title="@string/pref_camera_picturesize_title"
+            camera:singleIcon="@drawable/ic_settings_size"
             camera:entries="@array/pref_camera_video_snapsize_entries"
             camera:entryValues="@array/pref_camera_video_snapsize_entryvalues" />
     <IconListPreference
@@ -178,10 +187,11 @@
             camera:entries="@array/pref_camera_savepath_entries"
             camera:singleIcon="@drawable/ic_settings_storage"
             camera:entryValues="@array/pref_camera_savepath_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_video_rotation_key"
             camera:defaultValue="@string/pref_camera_video_rotation_default"
             camera:title="@string/pref_camera_video_rotation_title"
+            camera:singleIcon="@drawable/ic_settings_rotation"
             camera:entries="@array/pref_camera_video_rotation_entries"
             camera:entryValues="@array/pref_camera_video_rotation_entryvalues" />
     <IconListPreference