summaryrefslogtreecommitdiff
path: root/packages/SettingsLib/src/com/android/settingslib/Utils.java
diff options
context:
space:
mode:
Diffstat (limited to 'packages/SettingsLib/src/com/android/settingslib/Utils.java')
-rw-r--r--packages/SettingsLib/src/com/android/settingslib/Utils.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/Utils.java b/packages/SettingsLib/src/com/android/settingslib/Utils.java
index dee5a93d8eea..64ec16a23b46 100644
--- a/packages/SettingsLib/src/com/android/settingslib/Utils.java
+++ b/packages/SettingsLib/src/com/android/settingslib/Utils.java
@@ -14,6 +14,7 @@ import android.content.res.TypedArray;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Color;
+import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable;
import android.net.ConnectivityManager;
@@ -95,13 +96,12 @@ public class Utils {
/**
* Returns a circular icon for a user.
*/
- public static UserIconDrawable getUserIcon(Context context, UserManager um, UserInfo user) {
+ public static Drawable getUserIcon(Context context, UserManager um, UserInfo user) {
final int iconSize = UserIconDrawable.getSizeForList(context);
if (user.isManagedProfile()) {
- // We use predefined values for managed profiles
- Bitmap b = BitmapFactory.decodeResource(context.getResources(),
- com.android.internal.R.drawable.ic_corp_icon);
- return new UserIconDrawable(iconSize).setIcon(b).bake();
+ Drawable drawable = context.getDrawable(com.android.internal.R.drawable.ic_corp_icon);
+ drawable.setBounds(0, 0, iconSize, iconSize);
+ return drawable;
}
if (user.iconPath != null) {
Bitmap icon = um.getUserIcon(user.id);