summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/Utils.java
diff options
context:
space:
mode:
authorZoltan Szatmary-Ban <szatmz@google.com>2015-02-09 13:06:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-02-09 13:06:57 +0000
commit2e18bd9dbc78160621e1368b6ba21d55e6311edc (patch)
tree050ee72187841d02906d0eea39ba4c809572a727 /src/com/android/settings/Utils.java
parent2c228d8d7a0180f4756e018bc90dabfad60e6caa (diff)
parentae6ea36822dca031facb1c502aa9d527ceba658c (diff)
downloadpackages_apps_Settings-2e18bd9dbc78160621e1368b6ba21d55e6311edc.zip
packages_apps_Settings-2e18bd9dbc78160621e1368b6ba21d55e6311edc.tar.gz
packages_apps_Settings-2e18bd9dbc78160621e1368b6ba21d55e6311edc.tar.bz2
Merge "Remove frame and shadow from CircleFramedDrawable"
Diffstat (limited to 'src/com/android/settings/Utils.java')
-rw-r--r--src/com/android/settings/Utils.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index b85f5ce..9257c30 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -884,7 +884,8 @@ public final class Utils {
return CircleFramedDrawable.getInstance(context, icon);
}
}
- return UserIcons.getDefaultUserIcon(user.id, /* light= */ false);
+ return CircleFramedDrawable.getInstance(context, UserIcons.convertToBitmap(
+ UserIcons.getDefaultUserIcon(user.id, /* light= */ false)));
}
/**