From 39f82a7c9880668aabf5b6b877d50c6781162f95 Mon Sep 17 00:00:00 2001
From: Svetoslav <svetoslavganov@google.com>
Date: Thu, 4 Sep 2014 16:51:43 -0700
Subject: [PATCH] Update Settings due to API changes.

bug:17390424

Change-Id: I25dfa40cc5109260d48dbe5f33274b162912d059
---
 src/com/android/settings/DeviceAdminSettings.java            | 5 ++---
 src/com/android/settings/accounts/AuthenticatorHelper.java   | 4 ++--
 src/com/android/settings/accounts/ChooseAccountActivity.java | 5 ++---
 src/com/android/settings/location/RecentLocationApps.java    | 3 ++-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/com/android/settings/DeviceAdminSettings.java b/src/com/android/settings/DeviceAdminSettings.java
index 1ea98590d1f..a70984d7e67 100644
--- a/src/com/android/settings/DeviceAdminSettings.java
+++ b/src/com/android/settings/DeviceAdminSettings.java
@@ -20,7 +20,6 @@ import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
 import android.app.Activity;
-import android.app.Dialog;
 import android.app.AlertDialog;
 import android.app.ListFragment;
 import android.app.admin.DeviceAdminInfo;
@@ -305,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 = mUm.getBadgedDrawableForUser(activityIcon,
-                    new UserHandle(getUserId(item)));
+            Drawable badgedIcon = activity.getPackageManager().getUserBadgedDrawableForDensity(
+                    activityIcon, new UserHandle(getUserId(item)), null, 0);
             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 7ea2f12f076..c9c6ac4ea77 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 = mUm.getBadgedDrawableForUser(
-                        authContext.getResources().getDrawable(desc.iconId), mUserHandle);
+                icon = mContext.getPackageManager().getUserBadgedDrawableForDensity(
+                        authContext.getResources().getDrawable(desc.iconId), mUserHandle, null, 0);
                 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 7c0dbdb48a8..27edca1bcc0 100644
--- a/src/com/android/settings/accounts/ChooseAccountActivity.java
+++ b/src/com/android/settings/accounts/ChooseAccountActivity.java
@@ -18,7 +18,6 @@ package com.android.settings.accounts;
 
 import android.accounts.AccountManager;
 import android.accounts.AuthenticatorDescription;
-import android.app.ActivityManagerNative;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
@@ -216,8 +215,8 @@ public class ChooseAccountActivity extends PreferenceActivity {
             try {
                 AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
                 Context authContext = createPackageContextAsUser(desc.packageName, 0, mUserHandle);
-                icon = mUm.getBadgedDrawableForUser(
-                        authContext.getResources().getDrawable(desc.iconId), mUserHandle);
+                icon = getPackageManager().getUserBadgedDrawableForDensity(
+                        authContext.getResources().getDrawable(desc.iconId), mUserHandle, null, 0);
             } 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 e28f96bea29..6a40d665e09 100644
--- a/src/com/android/settings/location/RecentLocationApps.java
+++ b/src/com/android/settings/location/RecentLocationApps.java
@@ -212,7 +212,8 @@ public class RecentLocationApps {
 
             final UserHandle userHandle = new UserHandle(userId);
             Drawable appIcon = mPackageManager.getApplicationIcon(appInfo);
-            Drawable icon = um.getBadgedDrawableForUser(appIcon, userHandle);
+            Drawable icon = mPackageManager.getUserBadgedDrawableForDensity(appIcon, userHandle,
+                    null, 0);
             CharSequence appLabel = mPackageManager.getApplicationLabel(appInfo);
             CharSequence badgedAppLabel = um.getBadgedLabelForUser(appLabel.toString(), userHandle);
             preference = createRecentLocationEntry(icon,