From 30c50b15d0d716567c71d590aa835dc4a27591d6 Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Sun, 7 Sep 2014 15:38:09 -0700 Subject: [PATCH] Use correct API for badging Bug: 17414778 Change-Id: Ieb9890751c3071088b9f5aab48053e767f78bfe5 --- src/com/android/settings/DeviceAdminSettings.java | 4 ++-- src/com/android/settings/accounts/AuthenticatorHelper.java | 4 ++-- src/com/android/settings/accounts/ChooseAccountActivity.java | 4 ++-- src/com/android/settings/location/RecentLocationApps.java | 5 ++--- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/com/android/settings/DeviceAdminSettings.java b/src/com/android/settings/DeviceAdminSettings.java index a70984d7e6..6ac09740fb 100644 --- a/src/com/android/settings/DeviceAdminSettings.java +++ b/src/com/android/settings/DeviceAdminSettings.java @@ -304,8 +304,8 @@ public class DeviceAdminSettings extends ListFragment { final Activity activity = getActivity(); ViewHolder vh = (ViewHolder) view.getTag(); Drawable activityIcon = item.loadIcon(activity.getPackageManager()); - Drawable badgedIcon = activity.getPackageManager().getUserBadgedDrawableForDensity( - activityIcon, new UserHandle(getUserId(item)), null, 0); + Drawable badgedIcon = activity.getPackageManager().getUserBadgedIcon( + activityIcon, new UserHandle(getUserId(item))); vh.icon.setImageDrawable(badgedIcon); vh.name.setText(item.loadLabel(activity.getPackageManager())); vh.checkbox.setChecked(isActiveAdmin(item)); diff --git a/src/com/android/settings/accounts/AuthenticatorHelper.java b/src/com/android/settings/accounts/AuthenticatorHelper.java index c9c6ac4ea7..069d1e8238 100644 --- a/src/com/android/settings/accounts/AuthenticatorHelper.java +++ b/src/com/android/settings/accounts/AuthenticatorHelper.java @@ -104,8 +104,8 @@ final public class AuthenticatorHelper extends BroadcastReceiver { AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType); Context authContext = context.createPackageContextAsUser(desc.packageName, 0, mUserHandle); - icon = mContext.getPackageManager().getUserBadgedDrawableForDensity( - authContext.getResources().getDrawable(desc.iconId), mUserHandle, null, 0); + icon = mContext.getPackageManager().getUserBadgedIcon( + authContext.getResources().getDrawable(desc.iconId), mUserHandle); synchronized (mAccTypeIconCache) { mAccTypeIconCache.put(accountType, icon); } diff --git a/src/com/android/settings/accounts/ChooseAccountActivity.java b/src/com/android/settings/accounts/ChooseAccountActivity.java index 27edca1bcc..e52d640be5 100644 --- a/src/com/android/settings/accounts/ChooseAccountActivity.java +++ b/src/com/android/settings/accounts/ChooseAccountActivity.java @@ -215,8 +215,8 @@ public class ChooseAccountActivity extends PreferenceActivity { try { AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType); Context authContext = createPackageContextAsUser(desc.packageName, 0, mUserHandle); - icon = getPackageManager().getUserBadgedDrawableForDensity( - authContext.getResources().getDrawable(desc.iconId), mUserHandle, null, 0); + icon = getPackageManager().getUserBadgedIcon( + authContext.getResources().getDrawable(desc.iconId), mUserHandle); } catch (PackageManager.NameNotFoundException e) { // TODO: place holder icon for missing account icons? Log.w(TAG, "No icon name for account type " + accountType); diff --git a/src/com/android/settings/location/RecentLocationApps.java b/src/com/android/settings/location/RecentLocationApps.java index 6a40d665e0..7e99725921 100644 --- a/src/com/android/settings/location/RecentLocationApps.java +++ b/src/com/android/settings/location/RecentLocationApps.java @@ -212,10 +212,9 @@ public class RecentLocationApps { final UserHandle userHandle = new UserHandle(userId); Drawable appIcon = mPackageManager.getApplicationIcon(appInfo); - Drawable icon = mPackageManager.getUserBadgedDrawableForDensity(appIcon, userHandle, - null, 0); + Drawable icon = mPackageManager.getUserBadgedIcon(appIcon, userHandle); CharSequence appLabel = mPackageManager.getApplicationLabel(appInfo); - CharSequence badgedAppLabel = um.getBadgedLabelForUser(appLabel.toString(), userHandle); + CharSequence badgedAppLabel = mPackageManager.getUserBadgedLabel(appLabel, userHandle); preference = createRecentLocationEntry(icon, appLabel, highBattery, badgedAppLabel, new PackageEntryClickedListener(packageName)); -- 2.11.0