diff options
| author | Svetoslav <svetoslavganov@google.com> | 2014-09-04 16:51:43 -0700 |
|---|---|---|
| committer | Svetoslav <svetoslavganov@google.com> | 2014-09-04 18:00:23 -0700 |
| commit | 39f82a7c9880668aabf5b6b877d50c6781162f95 (patch) | |
| tree | 42ada255cef2613be94c35c660ab14ab9cbc11f5 /src/com/android/settings/accounts | |
| parent | 0535ed559eca51cce107309d05a3858ae48f5f20 (diff) | |
| download | packages_apps_Settings-39f82a7c9880668aabf5b6b877d50c6781162f95.tar.gz packages_apps_Settings-39f82a7c9880668aabf5b6b877d50c6781162f95.tar.bz2 packages_apps_Settings-39f82a7c9880668aabf5b6b877d50c6781162f95.zip | |
Update Settings due to API changes.
bug:17390424
Change-Id: I25dfa40cc5109260d48dbe5f33274b162912d059
Diffstat (limited to 'src/com/android/settings/accounts')
| -rw-r--r-- | src/com/android/settings/accounts/AuthenticatorHelper.java | 4 | ||||
| -rw-r--r-- | src/com/android/settings/accounts/ChooseAccountActivity.java | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/com/android/settings/accounts/AuthenticatorHelper.java b/src/com/android/settings/accounts/AuthenticatorHelper.java index 7ea2f12f0..c9c6ac4ea 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 7c0dbdb48..27edca1bc 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); |