PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch to using system-wide default user icons

Browse Source 
User icons were either User Settings specific, or missing. This makes it
consistent with the ones in the new helper class.

Bug: 17311038
Change-Id: I20cc1deba989cf7a397c5a8dba41bd91bd62472b
This commit is contained in:
Alexandra Gherghina
2014-09-03 10:22:09 +01:00
parent f8310c1850
commit bc6e78f9da
20 changed files with 39 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/Utils.java
View File

@@ -70,6 +70,8 @@ import android.view.ViewGroup;
import android.widget.ListView;
import android.widget.TabWidget;
import com.android.internal.util.ImageUtils;
import com.android.internal.util.UserIcons;
import com.android.settings.UserSpinnerAdapter.UserDetails;
import com.android.settings.dashboard.DashboardCategory;
import com.android.settings.dashboard.DashboardTile;
@@ -847,10 +849,13 @@ public final class Utils {
* Returns a circular icon for a user.
*/
public static Drawable getUserIcon(Context context, UserManager um, UserInfo user) {
if (user.iconPath == null) return null;
Bitmap icon = um.getUserIcon(user.id);
if (icon == null) return null;
return CircleFramedDrawable.getInstance(context, icon);
if (user.iconPath != null) {
Bitmap icon = um.getUserIcon(user.id);
if (icon != null) {
return CircleFramedDrawable.getInstance(context, icon);
}
}
return UserIcons.getDefaultUserIcon(user.id, /* light= */ false);
}
/**