diff options
Diffstat (limited to 'src/com/android')
6 files changed, 9 insertions, 8 deletions
diff --git a/src/com/android/settings/AccountPreference.java b/src/com/android/settings/AccountPreference.java index a860d1a..dc56334 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 1f9408d..b54df08 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 c0df8a7..bd28995 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 d6f192a..780d261 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 ad8c25b..00e397e 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 aae60eb..d1b5aef 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); } |