From 43a673053f2e9b1ace7ad9f32a58ae37f3e431d3 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Wed, 17 Nov 2010 15:21:18 -0800
Subject: [PATCH] Use the new Preference:icon attribute and placeholder for
 showing icons on the left.

---
 res/drawable-hdpi/nav_divider.png             | Bin 1012 -> 320 bytes
 res/drawable-mdpi/nav_divider.png             | Bin 2846 -> 311 bytes
 res/layout/account_preference.xml             |  45 +----------------
 res/layout/preference_bluetooth.xml           |  45 ++---------------
 res/layout/preference_bluetooth_profile.xml   |  46 +-----------------
 .../android/settings/AccountPreference.java   |   4 +-
 .../bluetooth/BluetoothDevicePreference.java  |   4 +-
 .../bluetooth/BluetoothProfilePreference.java |   4 +-
 .../bluetooth/DeviceProfilesSettings.java     |   1 +
 .../fuelgauge/PowerGaugePreference.java       |   2 +-
 .../settings/fuelgauge/PowerUsageSummary.java |   2 +-
 11 files changed, 17 insertions(+), 136 deletions(-)

diff --git a/res/drawable-hdpi/nav_divider.png b/res/drawable-hdpi/nav_divider.png
index 7ca3e6131b03adfd1b2d2fa7a29ce314d086a981..b1f035c93d93eb3d9767fa9e266ab62a46ff8b9b 100644
GIT binary patch
literal 320
zcmeAS@N?(olHy`uVBq!ia0vp^96)Tq!2%@P^gkZ}QcOwS?k)`f+xyS#2l6-zJR*x3
z7`TN%nDNrxx<4SnvI56+APv^bpmv;dI*_B{>EaloaXvXEAUPo+;m7~J#>T*oMj+^9
z<n7@C!2=8oX^Kp3xA*gX2C5e=ag8W(E=o--$;{7F2+7P%Ww6vYGSoLT2%nI27pOoL
zq#z}+B-JVzq$-uc$iUD**T7QO$Rxzjz{=3f%D_z5z}(8f;O@75wkR5M^HVa@DsgLA
zvzo0Ds6hr~LvVgtNqJ&XDuZK6ep0G}TV_#ed45rLv4V53Y2nt#W<Yfep00i_>zopr
E046qCIRF3v

literal 1012
zcmbVL%Wl&^6m^MIRW0qltVV9d0ueu(_@SD}Pa1?vl|~{f#KfL7R%?$LPl?+Vf(=za
z0R(@*2f%_gUx36<uwsWO<0LLDN*9b|&)k`N&V8Tl?cQHqzO~G8+-i5n>#_X?`?RG+
z_P@RG#$?+%^#^nxkLUyv#Mv<(BG66Y0qP+bpFI15wmGgbO8Nsj2p^geP6b%$2xXcx
zG{<ds${a?Ah=L(HNHUB6{^>IhlGx%Ow?Zk*T{KR1P6^sS-R(!GhmjHUoqJ%rG#NpP
zC<JACloe)a@l#%tovUk+2U8V#Xz??r2H_rXF+rduNX<xUOQ0<avbv>d+FhVXvLs51
zC@W1_GgZZuBrsn*vqs{P+4F+AEhbs~n9|%7#mQtMOjH4r15q{%qvBAMCevsZCmDrh
zGb=V~1`ibxNphOt3{;G8h>xkoGf!tBq<I)#5@*FcQ7mO*33E{vBr#2^xTe|#?V&$z
zT&Z33PjV#oP=Sw0#Og8HsKG3E*Bh!7nK$MmlCYw{BM(Q%DavTqvv~F*#7S(n4PEyY
zJ&+tlYwNOX2Z5)nveYsRU-LD$=C}&$1diU)4cB&Lw!Fac72oz%-SZSRaQ&dhcC&)Q
zEJC&2gxQ^AoolhCOAw@(^f5lFJ78~&DK5r12kw3ggfL37O0LQ?i`GLVd5+?M;1o>r
zYbICOZ@XKz=O}^tuefK}_<wRHGH1l9IsR&v`iga6b-ZkSCR`2=%GksZHX6U)t$bu-
zwb}LTe)(<q^Wvh@Sd!M(7GIs8ue|>8{%m16SnuC_@`7t{ciuku>ey*D#$4Cm^*%UH
GU;YMn*)?AP

diff --git a/res/drawable-mdpi/nav_divider.png b/res/drawable-mdpi/nav_divider.png
index c9413d7c147a56adb8ddc31ad5bee47d764f6f7e..f7ed6dff8ecf1393296142e701ec454f7a44286a 100644
GIT binary patch
literal 311
zcmeAS@N?(olHy`uVBq!ia0vp^tU#>5!2%=;*sERxDW)WEcNd2L?fqx=19_YU9+AZi
z4BSE>%y{W;-5-!(S%G6ZkOu2zxG<YT0?3i}ba4!kxSX64keu-2e_vonV`C>HpWDnU
zNlXl4(M)N!mZ}SZ%0x?CBTAf$QWHxu^Yau!GILWIEcJ~H^$iWeCnVhkDo_O}NJ%V7
zwMqu5N@XxIFf`CLu+%j&2{AOVGBmR?Fw-?Kw=yue`)!{siiX_$l+3hB+#1%bW@`j$
zkOA2coS#-wo>-L1;Fyx1l&avCS(I9yUzA;};2dmPxb?9aP#uG(tDnm{r-UW|s?Aib

literal 2846
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

diff --git a/res/layout/account_preference.xml b/res/layout/account_preference.xml
index 810c57a79d0..5e2edc6db3c 100644
--- a/res/layout/account_preference.xml
+++ b/res/layout/account_preference.xml
@@ -14,51 +14,8 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:gravity="center_vertical"
-    android:paddingLeft="16dip"
-    android:paddingRight="?android:attr/scrollbarSize">
-
-    <ImageView
-        android:id="@+id/providerIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="5dip"
-        android:layout_gravity="center" />
-
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="6dip"
-        android:layout_marginTop="6dip"
-        android:layout_marginBottom="6dip"
-        android:layout_weight="1">
-
-        <TextView android:id="@+android:id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <TextView android:id="@+android:id/summary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@android:id/title"
-            android:layout_alignLeft="@android:id/title"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:maxLines="2" />
-
-    </RelativeLayout>
-
-    <ImageView
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/syncStatusIcon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="5dip"
-        android:layout_marginRight="7dip"
         android:layout_gravity="center" />
-
-</LinearLayout>
diff --git a/res/layout/preference_bluetooth.xml b/res/layout/preference_bluetooth.xml
index 531bdc341fb..ff1162e16fa 100644
--- a/res/layout/preference_bluetooth.xml
+++ b/res/layout/preference_bluetooth.xml
@@ -17,49 +17,14 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:gravity="center_vertical"
-    android:paddingLeft="16dip"
-    android:paddingRight="?android:attr/scrollbarSize">
+    android:gravity="center_vertical">
 
-    <ImageView
-        android:id="@+id/btClass"
+    <LinearLayout android:id="@+id/profileIcons"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginRight="12dip"
-        android:layout_gravity="center_vertical" />
-
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="6dip"
-        android:layout_marginTop="6dip"
-        android:layout_marginBottom="6dip"
-        android:layout_weight="1">
-
-        <!-- Device name -->
-        <TextView android:id="@+android:id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
-
-        <!-- Status summary -->
-        <TextView android:id="@+android:id/summary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@android:id/title"
-            android:layout_alignLeft="@android:id/title"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:maxLines="2" />
-
-        <LinearLayout android:id="@+id/profileIcons"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_alignParentRight="true"
-            />
-    </RelativeLayout>
+        android:layout_centerVertical="true"
+        android:layout_alignParentRight="true"
+        />
 
     <!-- Divider -->
     <ImageView
diff --git a/res/layout/preference_bluetooth_profile.xml b/res/layout/preference_bluetooth_profile.xml
index 5ec0a479f99..03f598a23a0 100644
--- a/res/layout/preference_bluetooth_profile.xml
+++ b/res/layout/preference_bluetooth_profile.xml
@@ -15,51 +15,9 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:gravity="center_vertical"
-    android:paddingLeft="16dip"
-    android:paddingRight="?android:attr/scrollbarSize">
-
-    <ImageView
-        android:id="@+id/profileIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="12dip"
-        android:layout_gravity="center_vertical" />
-
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="6dip"
-        android:layout_marginTop="6dip"
-        android:layout_marginBottom="6dip"
-        android:layout_weight="1">
-
-        <!-- Device name -->
-        <TextView android:id="@+android:id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
-
-        <!-- Status summary -->
-        <TextView android:id="@+android:id/summary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@android:id/title"
-            android:layout_alignLeft="@android:id/title"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:maxLines="2" />
-
-        <LinearLayout android:id="@+id/profileIcons"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_alignParentRight="true"
-            />
-    </RelativeLayout>
+    android:gravity="center_vertical">
 
     <!-- Divider -->
     <ImageView
diff --git a/src/com/android/settings/AccountPreference.java b/src/com/android/settings/AccountPreference.java
index a860d1a5d28..dc5633457d2 100644
--- a/src/com/android/settings/AccountPreference.java
+++ b/src/com/android/settings/AccountPreference.java
@@ -49,7 +49,7 @@ public class AccountPreference extends Preference {
         mAccount = account;
         mAuthorities = authorities;
         mProviderIcon = icon;
-        setLayoutResource(R.layout.account_preference);
+        setWidgetLayoutResource(R.layout.account_preference);
         setTitle(mAccount.name);
         setSummary("");
         // Add account info to the intent for AccountSyncSettings
@@ -72,7 +72,7 @@ public class AccountPreference extends Preference {
     protected void onBindView(View view) {
         super.onBindView(view);
         setSummary(getSyncStatusMessage(mStatus));
-        mProviderIconView = (ImageView) view.findViewById(R.id.providerIcon);
+        mProviderIconView = (ImageView) view.findViewById(android.R.id.icon);
         mProviderIconView.setImageDrawable(mProviderIcon);
         mSyncStatusIcon = (ImageView) view.findViewById(R.id.syncStatusIcon);
         mSyncStatusIcon.setImageResource(getSyncStatusIcon(mStatus));
diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index 1f9408d12e4..b54df089116 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -64,7 +64,7 @@ public class BluetoothDevicePreference extends Preference implements
         mCachedDevice = cachedDevice;
         mAccessibleProfile = accessibleProfile;
 
-        setLayoutResource(R.layout.preference_bluetooth);
+        setWidgetLayoutResource(R.layout.preference_bluetooth);
 
         cachedDevice.registerCallback(this);
 
@@ -127,7 +127,7 @@ public class BluetoothDevicePreference extends Preference implements
 
         super.onBindView(view);
 
-        ImageView btClass = (ImageView) view.findViewById(R.id.btClass);
+        ImageView btClass = (ImageView) view.findViewById(android.R.id.icon);
         btClass.setImageResource(mCachedDevice.getBtClassDrawable());
         btClass.setAlpha(isEnabled() ? 255 : sDimAlpha);
 
diff --git a/src/com/android/settings/bluetooth/BluetoothProfilePreference.java b/src/com/android/settings/bluetooth/BluetoothProfilePreference.java
index c0df8a74140..bd2899540d9 100644
--- a/src/com/android/settings/bluetooth/BluetoothProfilePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothProfilePreference.java
@@ -48,7 +48,7 @@ public class BluetoothProfilePreference extends Preference implements OnClickLis
 
         mProfile = profile;
 
-        setLayoutResource(R.layout.preference_bluetooth_profile);
+        setWidgetLayoutResource(R.layout.preference_bluetooth_profile);
         setExpanded(false);
     }
 
@@ -73,7 +73,7 @@ public class BluetoothProfilePreference extends Preference implements OnClickLis
     protected void onBindView(View view) {
         super.onBindView(view);
 
-        ImageView btProfile = (ImageView) view.findViewById(R.id.profileIcon);
+        ImageView btProfile = (ImageView) view.findViewById(android.R.id.icon);
         btProfile.setImageDrawable(mProfileDrawable);
 
         mProfileExpandView = (ImageView) view.findViewById(R.id.profileExpand);
diff --git a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
index d6f192a119c..780d261545f 100644
--- a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
+++ b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
@@ -295,6 +295,7 @@ public class DeviceProfilesSettings extends SettingsPreferenceFragment
             CheckBoxPreference autoConnectPref = mAutoConnectPrefs.get(prof.toString());
             if (autoConnectPref == null) {
                 autoConnectPref = new CheckBoxPreference(getActivity());
+                autoConnectPref.setLayoutResource(com.android.internal.R.layout.preference_child);
                 autoConnectPref.setKey(prof.toString() + AUTO_CONNECT_KEY_SUFFIX);
                 autoConnectPref.setTitle(getCheckBoxTitle(prof));
                 autoConnectPref.setOrder(getProfilePreferenceIndex(prof) + 1);
diff --git a/src/com/android/settings/fuelgauge/PowerGaugePreference.java b/src/com/android/settings/fuelgauge/PowerGaugePreference.java
index ad8c25bc949..00e397e5c1f 100644
--- a/src/com/android/settings/fuelgauge/PowerGaugePreference.java
+++ b/src/com/android/settings/fuelgauge/PowerGaugePreference.java
@@ -64,7 +64,7 @@ public class PowerGaugePreference extends Preference {
         return mInfo;
     }
 
-    void setIcon(Drawable icon) {
+    void setPowerIcon(Drawable icon) {
         mIcon = icon;
         notifyChanged();
     }
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index aae60eb8497..d1b5aeff1e6 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -734,7 +734,7 @@ public class PowerUsageSummary extends PreferenceFragment implements Runnable {
                             (PowerGaugePreference) findPreference(
                                     Integer.toString(bs.uidObj.getUid()));
                     if (pgp != null) {
-                        pgp.setIcon(bs.icon);
+                        pgp.setPowerIcon(bs.icon);
                         pgp.setPercent(bs.percent);
                         pgp.setTitle(bs.name);
                     }