Eliminate duplicated code for creating circled user icons in Settings.
Use Utils.getUserIcon instead.
Change-Id: Id653f8c89ac041e925464c88bbc0c7c43d3ce632
diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java
index 206ed95..fe9374b 100644
--- a/src/com/android/settings/users/AppRestrictionsFragment.java
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java
@@ -327,16 +327,6 @@
return getPreferenceScreen();
}
- Drawable getCircularUserIcon() {
- Bitmap userIcon = mUserManager.getUserIcon(mUser.getIdentifier());
- if (userIcon == null) {
- return null;
- }
- CircleFramedDrawable circularIcon =
- CircleFramedDrawable.getInstance(this.getActivity(), userIcon);
- return circularIcon;
- }
-
protected void clearSelectedApps() {
mSelectedPackages.clear();
}
diff --git a/src/com/android/settings/users/EditUserInfoController.java b/src/com/android/settings/users/EditUserInfoController.java
index 0f844a7..ab77101 100644
--- a/src/com/android/settings/users/EditUserInfoController.java
+++ b/src/com/android/settings/users/EditUserInfoController.java
@@ -37,6 +37,7 @@
import android.widget.ImageView;
import com.android.settings.R;
+import com.android.settings.Utils;
import com.android.settings.drawable.CircleFramedDrawable;
/**
@@ -98,16 +99,6 @@
}
}
- Drawable getCircularUserIcon(Activity activity) {
- Bitmap userIcon = mUserManager.getUserIcon(mUser.getIdentifier());
- if (userIcon == null) {
- return null;
- }
- CircleFramedDrawable circularIcon =
- CircleFramedDrawable.getInstance(activity, userIcon);
- return circularIcon;
- }
-
public Dialog createDialog(final Fragment fragment, final Drawable currentUserIcon,
final CharSequence currentUserName,
int titleResId, final OnContentChangedCallback callback, UserHandle user) {
@@ -131,7 +122,7 @@
} else {
drawable = currentUserIcon;
if (drawable == null) {
- drawable = getCircularUserIcon(activity);
+ drawable = Utils.getUserIcon(activity, mUserManager, info);
}
}
userPhotoView.setImageDrawable(drawable);
diff --git a/src/com/android/settings/users/RestrictedProfileSettings.java b/src/com/android/settings/users/RestrictedProfileSettings.java
index c0e8cb7..014a55c 100644
--- a/src/com/android/settings/users/RestrictedProfileSettings.java
+++ b/src/com/android/settings/users/RestrictedProfileSettings.java
@@ -93,7 +93,7 @@
} else {
((TextView) mHeaderView.findViewById(android.R.id.title)).setText(info.name);
((ImageView) mHeaderView.findViewById(android.R.id.icon)).setImageDrawable(
- getCircularUserIcon());
+ Utils.getUserIcon(getActivity(), mUserManager, info));
}
}