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

10 files changed, 2 insertions, 19 deletions

diff --git a/res/drawable-hdpi/ic_dialog_flash_auto.png b/res/drawable-hdpi/ic_dialog_flash_auto.png
deleted file mode 100755
index ca044a9..0000000
--- a/res/drawable-hdpi/ic_dialog_flash_auto.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_dialog_flash_off.png b/res/drawable-hdpi/ic_dialog_flash_off.png
deleted file mode 100755
index 13809f1..0000000
--- a/res/drawable-hdpi/ic_dialog_flash_off.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_dialog_flash_on.png b/res/drawable-hdpi/ic_dialog_flash_on.png
deleted file mode 100755
index 2a9dec3..0000000
--- a/res/drawable-hdpi/ic_dialog_flash_on.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_dialog_flash_auto.png b/res/drawable-mdpi/ic_dialog_flash_auto.png
deleted file mode 100755
index 29c5a55..0000000
--- a/res/drawable-mdpi/ic_dialog_flash_auto.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_dialog_flash_off.png b/res/drawable-mdpi/ic_dialog_flash_off.png
deleted file mode 100755
index bf035f9..0000000
--- a/res/drawable-mdpi/ic_dialog_flash_off.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_dialog_flash_on.png b/res/drawable-mdpi/ic_dialog_flash_on.png
deleted file mode 100755
index 805e721..0000000
--- a/res/drawable-mdpi/ic_dialog_flash_on.png
+++ /dev/null
diff --git a/res/layout/on_screen_submenu_item.xml b/res/layout/on_screen_submenu_item.xml
index 8e0470e..f5079b3 100644
--- a/res/layout/on_screen_submenu_item.xml
+++ b/res/layout/on_screen_submenu_item.xml
@@ -20,12 +20,6 @@
         android:layout_height="wrap_content"
         android:minHeight="?android:attr/listPreferredItemHeight"
         android:gravity="center_vertical" >
-    <ImageView android:id="@+id/icon"
-            android:visibility="gone"
-            android:layout_marginRight="5dp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0" />
     <TextView android:id="@+id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 2b035bb..66519e9 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -97,12 +97,6 @@
         <item>off</item>
     </string-array>
 
-    <array name="pref_camera_flashmode_icons">
-        <item>@drawable/ic_dialog_flash_auto</item>
-        <item>@drawable/ic_dialog_flash_off</item>
-        <item>@drawable/ic_dialog_flash_on</item>
-    </array>
-
     <string-array name="pref_camera_recordlocation_entryvalues" translatable="false">
         <item>false</item>
         <item>true</item>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 96f4ebf..c780b7f 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -18,9 +18,6 @@
         <attr name="icons" format="reference" />
         <attr name="modes" format="reference" />
     </declare-styleable>
-    <declare-styleable name="IconListPreference">
-        <attr name="icons" />
-    </declare-styleable>
     <declare-styleable name="EvenlySpacedLayout">
         <attr name="orientation">
             <enum name="horizontal" value="0" />
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" />