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

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

Merge "Replace work profile icon with the new one"

parents a020374b bca5c933

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -1324,6 +1324,7 @@ 
  <java-symbol type="drawable" name="cling_button" />

  <java-symbol type="drawable" name="cling_arrow_up" />

  <java-symbol type="drawable" name="cling_bg" />

  <java-symbol type="drawable" name="ic_corp_badge" />

  <java-symbol type="drawable" name="ic_corp_badge_color" />

  <java-symbol type="drawable" name="ic_corp_badge_case" />

  <java-symbol type="drawable" name="ic_corp_icon" />

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

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ public class Utils { 
    public static Drawable getUserIcon(Context context, UserManager um, UserInfo user) {

        final int iconSize = UserIconDrawable.getSizeForList(context);

        if (user.isManagedProfile()) {

            Drawable drawable = context.getDrawable(com.android.internal.R.drawable.ic_corp_icon);

            Drawable drawable = context.getDrawable(com.android.internal.R.drawable.ic_corp_badge);

            drawable.setBounds(0, 0, iconSize, iconSize);

            return drawable;

        }

packages/SettingsLib/src/com/android/settingslib/drawer/UserAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ public class UserAdapter implements SpinnerAdapter, ListAdapter { 
            if (userInfo.isManagedProfile()) {

                mName = context.getString(R.string.managed_user_title);

                icon = context.getDrawable(

                    com.android.internal.R.drawable.ic_corp_icon);

                    com.android.internal.R.drawable.ic_corp_badge);

            } else {

                mName = userInfo.name;

                final int userId = userInfo.id;