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

Update Settings due to API changes.

Browse Source 
bug:17390424

Change-Id: I25dfa40cc5109260d48dbe5f33274b162912d059
This commit is contained in:
Svetoslav
2014-09-04 16:51:43 -07:00
parent 0535ed559e
commit 39f82a7c98
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,6 @@ import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserException;
import android.app.Activity; import android.app.Activity;
import android.app.Dialog;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.ListFragment; import android.app.ListFragment;
import android.app.admin.DeviceAdminInfo; import android.app.admin.DeviceAdminInfo;
@@ -305,8 +304,8 @@ public class DeviceAdminSettings extends ListFragment {
final Activity activity = getActivity(); final Activity activity = getActivity();
ViewHolder vh = (ViewHolder) view.getTag(); ViewHolder vh = (ViewHolder) view.getTag();
Drawable activityIcon = item.loadIcon(activity.getPackageManager()); Drawable activityIcon = item.loadIcon(activity.getPackageManager());
Drawable badgedIcon = mUm.getBadgedDrawableForUser(activityIcon, Drawable badgedIcon = activity.getPackageManager().getUserBadgedDrawableForDensity(
new UserHandle(getUserId(item))); activityIcon, new UserHandle(getUserId(item)), null, 0);
vh.icon.setImageDrawable(badgedIcon); vh.icon.setImageDrawable(badgedIcon);
vh.name.setText(item.loadLabel(activity.getPackageManager())); vh.name.setText(item.loadLabel(activity.getPackageManager()));
vh.checkbox.setChecked(isActiveAdmin(item)); 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); AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
Context authContext = context.createPackageContextAsUser(desc.packageName, 0, Context authContext = context.createPackageContextAsUser(desc.packageName, 0,
mUserHandle); mUserHandle);
icon = mUm.getBadgedDrawableForUser( icon = mContext.getPackageManager().getUserBadgedDrawableForDensity(
authContext.getResources().getDrawable(desc.iconId), mUserHandle); authContext.getResources().getDrawable(desc.iconId), mUserHandle, null, 0);
synchronized (mAccTypeIconCache) { synchronized (mAccTypeIconCache) {
mAccTypeIconCache.put(accountType, icon); mAccTypeIconCache.put(accountType, icon);
} }

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

@@ -18,7 +18,6 @@ package com.android.settings.accounts;
import android.accounts.AccountManager; import android.accounts.AccountManager;
import android.accounts.AuthenticatorDescription; import android.accounts.AuthenticatorDescription;
import android.app.ActivityManagerNative;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -216,8 +215,8 @@ public class ChooseAccountActivity extends PreferenceActivity {
try { try {
AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType); AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
Context authContext = createPackageContextAsUser(desc.packageName, 0, mUserHandle); Context authContext = createPackageContextAsUser(desc.packageName, 0, mUserHandle);
icon = mUm.getBadgedDrawableForUser( icon = getPackageManager().getUserBadgedDrawableForDensity(
authContext.getResources().getDrawable(desc.iconId), mUserHandle); authContext.getResources().getDrawable(desc.iconId), mUserHandle, null, 0);
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
// TODO: place holder icon for missing account icons? // TODO: place holder icon for missing account icons?
Log.w(TAG, "No icon name for account type " + accountType); Log.w(TAG, "No icon name for account type " + accountType);

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

@@ -212,7 +212,8 @@ public class RecentLocationApps {
final UserHandle userHandle = new UserHandle(userId); final UserHandle userHandle = new UserHandle(userId);
Drawable appIcon = mPackageManager.getApplicationIcon(appInfo); 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 appLabel = mPackageManager.getApplicationLabel(appInfo);
CharSequence badgedAppLabel = um.getBadgedLabelForUser(appLabel.toString(), userHandle); CharSequence badgedAppLabel = um.getBadgedLabelForUser(appLabel.toString(), userHandle);
preference = createRecentLocationEntry(icon, preference = createRecentLocationEntry(icon,