diff options
author | Cheng-Ru Lin <owenlin@google.com> | 2009-10-01 05:10:55 +0800 |
---|---|---|
committer | Cheng-Ru Lin <owenlin@google.com> | 2009-10-01 08:36:13 +0800 |
commit | f404a034455cef3b214236449eab859c4e8999b8 (patch) | |
tree | e224f8cdb39ea8819883662cbbd1c907aab1f428 | |
parent | 2f3774c974a5a044a3b32ca68182a3f2180d0124 (diff) | |
download | packages_apps_LegacyCamera-f404a034455cef3b214236449eab859c4e8999b8.zip packages_apps_LegacyCamera-f404a034455cef3b214236449eab859c4e8999b8.tar.gz packages_apps_LegacyCamera-f404a034455cef3b214236449eab859c4e8999b8.tar.bz2 |
Add icons in on screen menu for whitebalance and focus mode.
Change-Id: Ic10c68404a703279918c3a86473d364030affa8a
-rw-r--r-- | res/drawable-hdpi/ic_viewfinder_empty.png | bin | 0 -> 1271 bytes | |||
-rw-r--r-- | res/drawable-hdpi/ic_viewfinder_flash_off.png | bin | 0 -> 2985 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_viewfinder_empty.png | bin | 0 -> 3884 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_viewfinder_flash_off.png | bin | 0 -> 5416 bytes | |||
-rw-r--r-- | res/values/arrays.xml | 24 | ||||
-rw-r--r-- | res/xml/camera_preferences.xml | 6 |
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 Binary files differnew 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 Binary files differnew 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 Binary files differnew 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 Binary files differnew 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" /> |