Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b76ddcd2 authored by Daniel Nishi's avatar Daniel Nishi Committed by android-build-merger
Browse files

Merge "Fix the user profile icon." into oc-mr1-dev am: 6ebd3594 

am: 1d4daee1

Change-Id: I2e9e2fb1e3c2cbb5f13ff3a4c9ec94a03c78064c
parents cd0e2200 1d4daee1

packages/SettingsLib/src/com/android/settingslib/Utils.java

+3 −5
Original line number Diff line number Diff line
@@ -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.net.ConnectivityManager;

import android.os.BatteryManager;
@@ -92,13 +93,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);