PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use correct API for badging

Browse Source 
Bug: 17414778
Change-Id: Ieb9890751c3071088b9f5aab48053e767f78bfe5
This commit is contained in:
Amith Yamasani
2014-09-07 15:38:09 -07:00
parent b5cc01342e
commit 30c50b15d0
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/DeviceAdminSettings.java
View File

@@ -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));

4
src/com/android/settings/accounts/AuthenticatorHelper.java
View File

@@ -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);
}

4
src/com/android/settings/accounts/ChooseAccountActivity.java
View File

@@ -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);

5
src/com/android/settings/location/RecentLocationApps.java
View File

@@ -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));