summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/users
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2012-09-19 11:15:45 -0700
committerJeff Sharkey <jsharkey@android.com>2012-09-19 11:16:24 -0700
commit8882ccdd3eafc338213b312f1b73fb4de1776a60 (patch)
treeab339279ac8c2c15cd3cca8f543e12e312aa48ea /src/com/android/settings/users
parentf5de1db28a61d159e62ef42f64a2cdcb316d0c2c (diff)
downloadpackages_apps_Settings-8882ccdd3eafc338213b312f1b73fb4de1776a60.zip
packages_apps_Settings-8882ccdd3eafc338213b312f1b73fb4de1776a60.tar.gz
packages_apps_Settings-8882ccdd3eafc338213b312f1b73fb4de1776a60.tar.bz2
Load user photos through system_server.
Bug: 7194137 Change-Id: Ie36ca40c48fb06d55d120bfcf3db69aea9d83829
Diffstat (limited to 'src/com/android/settings/users')
-rw-r--r--src/com/android/settings/users/UserUtils.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/com/android/settings/users/UserUtils.java b/src/com/android/settings/users/UserUtils.java
index 433cbd3..1d16bcf 100644
--- a/src/com/android/settings/users/UserUtils.java
+++ b/src/com/android/settings/users/UserUtils.java
@@ -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);
}
}