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
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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" />
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index e4737be..d81756d 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -3,7 +3,6 @@
import android.app.Activity;
import android.content.Context;
import android.content.SharedPreferences;
-import android.graphics.drawable.Drawable;
import android.hardware.Camera.Parameters;
import android.hardware.Camera.Size;
import android.os.SystemProperties;
@@ -188,29 +187,19 @@
// Prepare setting entries and entry values.
CharSequence[] allEntries = pref.getEntries();
CharSequence[] allEntryValues = pref.getEntryValues();
- Drawable[] allIcons = (pref instanceof IconListPreference)
- ? ((IconListPreference) pref).getIcons()
- : null;
ArrayList<CharSequence> entries = new ArrayList<CharSequence>();
ArrayList<CharSequence> entryValues = new ArrayList<CharSequence>();
- ArrayList<Drawable> icons =
- allIcons == null ? null : new ArrayList<Drawable>();
for (int i = 0, len = allEntryValues.length; i < len; i++) {
if (supported.indexOf(allEntryValues[i].toString()) != NOT_FOUND) {
entries.add(allEntries[i]);
entryValues.add(allEntryValues[i]);
- if (allIcons != null) icons.add(allIcons[i]);
}
}
// Set entries and entry values to list preference.
- int size = entries.size();
- pref.setEntries(entries.toArray(new CharSequence[size]));
- pref.setEntryValues(entryValues.toArray(new CharSequence[size]));
- if (allIcons != null) {
- ((IconListPreference) pref)
- .setIcons(icons.toArray(new Drawable[size]));
- }
+ pref.setEntries(entries.toArray(new CharSequence[entries.size()]));
+ pref.setEntryValues(entryValues.toArray(
+ new CharSequence[entryValues.size()]));
// Set the value to the first entry if it is invalid.
String value = pref.getValue();
diff --git a/src/com/android/camera/IconListPreference.java b/src/com/android/camera/IconListPreference.java
deleted file mode 100644
index 314b7a9..0000000
--- a/src/com/android/camera/IconListPreference.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.camera;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.graphics.drawable.Drawable;
-import android.preference.ListPreference;
-import android.util.AttributeSet;
-
-public class IconListPreference extends ListPreference {
- private Drawable mIcons[];
- private Resources mResources;
-
- public IconListPreference(Context context, AttributeSet attrs) {
- super(context, attrs);
- TypedArray a = context.obtainStyledAttributes(
- attrs, R.styleable.IconListPreference, 0, 0);
- mResources = context.getResources();
- setIcons(a.getResourceId(R.styleable.IconListPreference_icons, 0));
- a.recycle();
- }
-
- public Drawable[] getIcons() {
- return mIcons;
- }
-
- private void setIcons(int iconsRes) {
- TypedArray array = mResources.obtainTypedArray(iconsRes);
- int n = array.length();
- Drawable drawable[] = new Drawable[n];
- for (int i = 0; i < n; ++i) {
- int id = array.getResourceId(i, 0);
- drawable[i] = id == 0 ? null : mResources.getDrawable(id);
- }
- array.recycle();
- mIcons = drawable;
- }
-
- public void setIcons(Drawable[] icons) {
- mIcons = icons;
- }
-}
diff --git a/src/com/android/camera/OnScreenSettings.java b/src/com/android/camera/OnScreenSettings.java
index c9d1f93..6bfc88c 100644
--- a/src/com/android/camera/OnScreenSettings.java
+++ b/src/com/android/camera/OnScreenSettings.java
@@ -21,7 +21,6 @@
import android.widget.AdapterView;
import android.widget.BaseAdapter;
import android.widget.FrameLayout;
-import android.widget.ImageView;
import android.widget.ListView;
import android.widget.RadioButton;
import android.widget.TextView;
@@ -358,13 +357,9 @@
private class SubMenuAdapter extends BaseAdapter
implements OnItemClickListener {
private final ListPreference mPreference;
- private final IconListPreference mIconPreference;
public SubMenuAdapter(Context context, ListPreference preference) {
mPreference = preference;
- mIconPreference = (preference instanceof IconListPreference)
- ? (IconListPreference) preference
- : null;
}
public View getView(int position, View convertView, ViewGroup parent) {
@@ -375,24 +370,15 @@
((TextView) convertView.findViewById(
R.id.title)).setText(mPreference.getDialogTitle());
} else {
- int index = position - 1;
convertView = inflateIfNeed(convertView,
R.layout.on_screen_submenu_item, parent, false);
boolean checked = mPreference.getValue().equals(
- mPreference.getEntryValues()[index]);
+ mPreference.getEntryValues()[position - 1]);
((TextView) convertView.findViewById(
- R.id.title)).setText(entry[index]);
- ((RadioButton) convertView.findViewById(
- R.id.radio_button)).setChecked(checked);
- ImageView icon = (ImageView)
- convertView.findViewById(R.id.icon);
- if (mIconPreference != null) {
- icon.setVisibility(View.VISIBLE);
- icon.setImageDrawable(
- mIconPreference.getIcons()[position-1]);
- } else {
- icon.setVisibility(View.GONE);
- }
+ R.id.title)).setText(entry[position - 1]);
+ RadioButton radio = ((RadioButton)
+ convertView.findViewById(R.id.radio_button));
+ radio.setChecked(checked);
}
return convertView;
}
