diff options
| author | Cheng-Ru Lin <owenlin@google.com> | 2009-10-01 02:29:55 +0800 |
|---|---|---|
| committer | Cheng-Ru Lin <owenlin@google.com> | 2009-10-01 08:36:13 +0800 |
| commit | 2f3774c974a5a044a3b32ca68182a3f2180d0124 (patch) | |
| tree | 72a6ce29ae1bab6508058df80ad0b4e7cf7b262f /res/xml/camera_preferences.xml | |
| parent | 25156f0e1bb921d3d8f7f5cc51e141522533b502 (diff) | |
| download | packages_apps_LegacyCamera-2f3774c974a5a044a3b32ca68182a3f2180d0124.zip packages_apps_LegacyCamera-2f3774c974a5a044a3b32ca68182a3f2180d0124.tar.gz packages_apps_LegacyCamera-2f3774c974a5a044a3b32ca68182a3f2180d0124.tar.bz2 | |
Revert "Revert "Add icon support for options in preference setting screen.""
This reverts commit 7af25641ec401d9f669497bd401020f2cb5933ef.
Change-Id: I03381ffeee4aca787ea376bcd5fe150ff0f97dbf
Diffstat (limited to 'res/xml/camera_preferences.xml')
| -rw-r--r-- | res/xml/camera_preferences.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index aae592a..edcb23f 100644 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -14,12 +14,14 @@ limitations under the License. --> -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"> <PreferenceCategory android:title="@string/pref_camera_settings_category"> - <ListPreference + <com.android.camera.IconListPreference android:key="pref_camera_flashmode_key" android:defaultValue="@string/pref_camera_flashmode_default" android:title="@string/pref_camera_flashmode_title" + camera:icons="@array/pref_camera_flashmode_icons" android:entries="@array/pref_camera_flashmode_entries" android:entryValues="@array/pref_camera_flashmode_entryvalues" android:dialogTitle="@string/pref_camera_flashmode_dialogtitle" /> |