Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the user profile icon." into oc-mr1-dev

Browse Source
This commit is contained in:
Daniel Nishi
2017-08-24 23:29:35 +00:00
committed by Android (Google) Code Review
parent f0b56a65f6 f26dbd8f96
commit 6ebd3594ae
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SettingsLib/src/com/android/settingslib/Utils.java
View File

@@ -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,10 @@ 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();
return context.getDrawable(com.android.internal.R.drawable.ic_corp_icon);
}
if (user.iconPath != null) {
Bitmap icon = um.getUserIcon(user.id);