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

Commit 8cca880b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert change to non-profile user badged icon"

parents 153f66fb d6296d73

packages/SettingsLib/src/com/android/settingslib/drawable/UserIconDrawable.java

+2 −3
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import android.graphics.Shader; 
import android.graphics.drawable.BitmapDrawable;

import android.graphics.drawable.Drawable;

import android.os.UserHandle;

import android.os.UserManager;



import com.android.settingslib.R;
@@ -177,8 +176,8 @@ public class UserIconDrawable extends Drawable implements Drawable.Callback { 
            boolean isManaged = context.getSystemService(DevicePolicyManager.class)

                    .getProfileOwnerAsUser(userId) != null;

            if (isManaged) {

                badge = getDrawableForDisplayDensity(context,

                        context.getSystemService(UserManager.class).getUserBadgeResId(userId));

                badge = getDrawableForDisplayDensity(

                        context, com.android.internal.R.drawable.ic_corp_badge_case);

            }

        }

        return setBadge(badge);