From 7af25641ec401d9f669497bd401020f2cb5933ef Mon Sep 17 00:00:00 2001
From: Cheng-Ru Lin <owenlin@google.com>
Date: Wed, 30 Sep 2009 04:37:18 +0800
Subject: Revert "Add icon support for options in preference setting screen."

This reverts commit 723f84eadb3c1a79337ef20e4d0a014341537adb.

Conflicts:

	res/values/arrays.xml
	res/xml/camera_preferences.xml
	src/com/android/camera/IconListPreference.java

Change-Id: Ic5fd32735656cfaed56cf256a0b9530d051f2240
---
 res/xml/camera_preferences.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'res/xml')

diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index edcb23f..aae592a 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -14,14 +14,12 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:camera="http://schemas.android.com/apk/res/com.android.camera">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceCategory android:title="@string/pref_camera_settings_category">
-        <com.android.camera.IconListPreference
+        <ListPreference
                 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" />
-- 
cgit v1.1