commit 273a6e7ffdb1342564fa1ad57225b8efbe7e62e5
author Zoltan Szatmary-Ban <szatmz@google.com> Mon Feb 09 13:13:37 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 09 13:13:38 2015 +0000
tree 0deef749ece3fe8cde79b93396cb2e3947daca43
parent 2e18bd9dbc78160621e1368b6ba21d55e6311edc
parent d7cadf3de2cf8272e817a416549fc2d47852f3b9

Merge "Eliminate duplicated code for creating circled user icons in Settings."

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

diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java
index 6d4bed1..faaa333 100644
--- a/src/com/android/settings/users/AppRestrictionsFragment.java
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java
@@ -317,16 +317,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();
     }

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

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);

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

diff --git a/src/com/android/settings/users/RestrictedProfileSettings.java b/src/com/android/settings/users/RestrictedProfileSettings.java
index 82090d4..03a55d4 100644
--- a/src/com/android/settings/users/RestrictedProfileSettings.java
+++ b/src/com/android/settings/users/RestrictedProfileSettings.java
@@ -90,7 +90,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));
         }
     }