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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-11-22 22:48:09 +00:00
committed by Android (Google) Code Review
parent 153f66fb91 d6296d7348
commit 8cca880bee
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SettingsLib/src/com/android/settingslib/drawable/UserIconDrawable.java
View File

@@ -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);