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

Commit 8882ccdd authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Load user photos through system_server. 

Bug: 7194137
Change-Id: Ie36ca40c48fb06d55d120bfcf3db69aea9d83829
parent f5de1db2

src/com/android/settings/fuelgauge/PowerUsageSummary.java

+1 −4
Original line number Diff line number Diff line
@@ -767,10 +767,7 @@ public class PowerUsageSummary extends PreferenceFragment implements Runnable { 
            final int userId = mUserSippers.keyAt(i);

            final List<BatterySipper> sippers = mUserSippers.valueAt(i);

            UserInfo info = mUm.getUserInfo(userId);

            Drawable icon = null;

            if (info != null && info.iconPath != null) {

                icon = UserUtils.getUserIcon(mUm, info);

            }

            Drawable icon = UserUtils.getUserIcon(mUm, info, getResources());

            String name = info != null ? info.name : null;

            if (name == null) {

                name = Integer.toString(info.id);

src/com/android/settings/net/UidDetailProvider.java

+2 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.util.SparseArray; 


import com.android.settings.R;

import com.android.settings.Utils;

import com.android.settings.users.UserUtils;



/**

 * Return details about a specific UID, handling special cases like
@@ -118,7 +119,7 @@ public class UidDetailProvider { 
            final UserInfo info = um.getUserInfo(userHandle);

            if (info != null) {

                detail.label = res.getString(R.string.running_process_item_user_label, info.name);

                detail.icon = Drawable.createFromPath(info.iconPath);

                detail.icon = UserUtils.getUserIcon(um, info, res);

                return detail;

            }

        }

src/com/android/settings/users/UserUtils.java

+3 −4
Original line number Diff line number Diff line
@@ -17,18 +17,17 @@ 
package com.android.settings.users;



import android.content.pm.UserInfo;

import android.content.res.Resources;

import android.graphics.Bitmap;

import android.graphics.drawable.BitmapDrawable;

import android.graphics.drawable.Drawable;

import android.os.ParcelFileDescriptor;

import android.os.UserManager;



public class UserUtils {



    public static Drawable getUserIcon(UserManager um, UserInfo user) {

    public static Drawable getUserIcon(UserManager um, UserInfo user, Resources res) {

        if (user.iconPath == null) return null;

        Bitmap icon = um.getUserIcon(user.id);

        if (icon == null) return null;

        return new BitmapDrawable(icon);

        return new BitmapDrawable(res, icon);

    }

}