Add icons in on screen menu for whitebalance and focus mode.

Change-Id: Ic10c68404a703279918c3a86473d364030affa8a

6 files changed, 23 insertions, 7 deletions

diff --git a/res/drawable-hdpi/ic_viewfinder_empty.png b/res/drawable-hdpi/ic_viewfinder_empty.png
new file mode 100644
index 0000000..6fe7fef
--- /dev/null
+++ b/res/drawable-hdpi/ic_viewfinder_empty.png
diff --git a/res/drawable-hdpi/ic_viewfinder_flash_off.png b/res/drawable-hdpi/ic_viewfinder_flash_off.png
new file mode 100644
index 0000000..4a8bb95
--- /dev/null
+++ b/res/drawable-hdpi/ic_viewfinder_flash_off.png
diff --git a/res/drawable-mdpi/ic_viewfinder_empty.png b/res/drawable-mdpi/ic_viewfinder_empty.png
new file mode 100644
index 0000000..2d9884b
--- /dev/null
+++ b/res/drawable-mdpi/ic_viewfinder_empty.png
diff --git a/res/drawable-mdpi/ic_viewfinder_flash_off.png b/res/drawable-mdpi/ic_viewfinder_flash_off.png
new file mode 100644
index 0000000..d076636
--- /dev/null
+++ b/res/drawable-mdpi/ic_viewfinder_flash_off.png
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index aad2bad..d928384 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -84,8 +84,14 @@
         <item>macro</item>
     </string-array>
 
+    <array name="pref_camera_focusmode_icons" translatable="false">
+        <item>@drawable/ic_viewfinder_empty</item>
+        <item>@drawable/ic_viewfinder_focus_infinity</item>
+        <item>@drawable/ic_viewfinder_focus_macro</item>
+    </array>
+
     <array name="focusmode_icons">
-        <item>0</item>
+        <item>@drawable/ic_viewfinder_empty</item>
         <item>@drawable/ic_viewfinder_focus_infinity</item>
         <item>@drawable/ic_viewfinder_focus_macro</item>
     </array>
@@ -105,7 +111,7 @@
 
     <array name="pref_camera_flashmode_icons">
         <item>@drawable/ic_viewfinder_flash_auto</item>
-        <item>0</item>
+        <item>@drawable/ic_viewfinder_flash_off</item>
         <item>@drawable/ic_viewfinder_flash_on</item>
     </array>
 
@@ -122,7 +128,7 @@
     <array name="flash_icons">
         <item>@drawable/ic_viewfinder_flash_auto</item>
         <item>@drawable/ic_viewfinder_flash_on</item>
-        <item>0</item>
+        <item>@drawable/ic_viewfinder_empty</item>
     </array>
 
     <string-array name="gps_modes" translatable="false">
@@ -152,8 +158,16 @@
         <item>cloudy</item>
     </string-array>
 
+    <array name="pref_camera_whitebalance_icons">
+        <item>@drawable/ic_viewfinder_empty</item>
+        <item>@drawable/ic_viewfinder_wb_incandescent</item>
+        <item>@drawable/ic_viewfinder_wb_daylight</item>
+        <item>@drawable/ic_viewfinder_wb_fluorescent</item>
+        <item>@drawable/ic_viewfinder_wb_cloudy</item>
+    </array>
+
     <array name="whitebalance_icons">
-        <item>0</item>
+        <item>@drawable/ic_viewfinder_empty</item>
         <item>@drawable/ic_viewfinder_wb_incandescent</item>
         <item>@drawable/ic_viewfinder_wb_daylight</item>
         <item>@drawable/ic_viewfinder_wb_fluorescent</item>
@@ -232,7 +246,7 @@
     </string-array>
 
     <array name="scenemode_icons">
-        <item>0</item>
+        <item>@drawable/ic_viewfinder_empty</item>
         <item>@drawable/ic_viewfinder_scenemode</item>
     </array>
 
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index edcb23f..a59de44 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -32,10 +32,11 @@
                 android:entries="@array/pref_camera_scenemode_entries"
                 android:entryValues="@array/pref_camera_scenemode_entryvalues"
                 android:dialogTitle="@string/pref_camera_scenemode_dialogtitle" />
-        <ListPreference
+        <com.android.camera.IconListPreference
                 android:key="pref_camera_whitebalance_key"
                 android:defaultValue="@string/pref_camera_whitebalance_default"
                 android:title="@string/pref_camera_whitebalance_title"
+                camera:icons="@array/pref_camera_whitebalance_icons"
                 android:entries="@array/pref_camera_whitebalance_entries"
                 android:entryValues="@array/pref_camera_whitebalance_entryvalues"
                 android:dialogTitle="@string/pref_camera_whitebalance_dialogtitle" />
@@ -65,10 +66,11 @@
                 android:entries="@array/pref_camera_jpegquality_entries"
                 android:entryValues="@array/pref_camera_jpegquality_entryvalues"
                 android:dialogTitle="@string/pref_camera_jpegquality_dialogtitle" />
-        <ListPreference
+        <com.android.camera.IconListPreference
                 android:key="pref_camera_focusmode_key"
                 android:defaultValue="@string/pref_camera_focusmode_default"
                 android:title="@string/pref_camera_focusmode_title"
+                camera:icons="@array/pref_camera_focusmode_icons"
                 android:entries="@array/pref_camera_focusmode_entries"
                 android:entryValues="@array/pref_camera_focusmode_entryvalues"
                 android:dialogTitle="@string/pref_camera_focusmode_dialogtitle" />