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

Commit 7d3b6b47 authored by Alexandra Gherghina's avatar Alexandra Gherghina
Browse files

Use plain user icon in UserSpinnerAdapter 

Before, we were using CircleFramedDrawable, used by user settings.
That performs some alterations on the image (adds an outline and
shadow) that made it inconsistent with the corp icon.

Bug: 17561925
Change-Id: I2490360d332a1b93864858122868b571f2949617
parent 3156e38f

src/com/android/settings/UserSpinnerAdapter.java

+6 −8
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.content.Context; 
import android.content.pm.UserInfo;

import android.content.res.Resources;

import android.database.DataSetObserver;

import android.graphics.Bitmap;

import android.graphics.drawable.BitmapDrawable;

import android.graphics.drawable.Drawable;

import android.os.UserHandle;

import android.os.UserManager;
@@ -32,8 +32,6 @@ import android.widget.SpinnerAdapter; 
import android.widget.TextView;



import com.android.internal.util.UserIcons;

import com.android.settings.drawable.CircleFramedDrawable;

import com.android.settings.R;



import java.util.ArrayList;
@@ -57,11 +55,11 @@ public class UserSpinnerAdapter implements SpinnerAdapter { 
                    com.android.internal.R.drawable.ic_corp_icon);

            } else {

                name = userInfo.name;

                Bitmap bitmap = um.getUserIcon(userHandle.getIdentifier());

                if (bitmap != null) {

                    icon = CircleFramedDrawable.getInstance(context, bitmap);

                final int userId = userInfo.id;

                if (um.getUserIcon(userId) != null) {

                    icon = new BitmapDrawable(context.getResources(), um.getUserIcon(userId));

                } else {

                    icon = UserIcons.getDefaultUserIcon(userInfo.id, /* light= */ false);

                    icon = UserIcons.getDefaultUserIcon(userId, /* light= */ false);

                }

            }

        }