From d7cadf3de2cf8272e817a416549fc2d47852f3b9 Mon Sep 17 00:00:00 2001
From: Zoltan Szatmary-Ban <szatmz@google.com>
Date: Fri, 19 Dec 2014 15:23:16 +0000
Subject: [PATCH] Eliminate duplicated code for creating circled user icons in
 Settings.

Use Utils.getUserIcon instead.

Change-Id: Id653f8c89ac041e925464c88bbc0c7c43d3ce632
---
 src/com/android/settings/users/AppRestrictionsFragment.java | 10 ----------
 src/com/android/settings/users/EditUserInfoController.java  | 13 ++-----------
 .../android/settings/users/RestrictedProfileSettings.java   |  2 +-
 3 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java
index 206ed95b30..fe9374b1e6 100644
--- a/src/com/android/settings/users/AppRestrictionsFragment.java
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java
@@ -327,16 +327,6 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
         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 0f844a7916..ab771012d0 100644
--- a/src/com/android/settings/users/EditUserInfoController.java
+++ b/src/com/android/settings/users/EditUserInfoController.java
@@ -37,6 +37,7 @@ import android.widget.EditText;
 import android.widget.ImageView;
 
 import com.android.settings.R;
+import com.android.settings.Utils;
 import com.android.settings.drawable.CircleFramedDrawable;
 
 /**
@@ -98,16 +99,6 @@ public class EditUserInfoController {
         }
     }
 
-    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 @@ public class EditUserInfoController {
         } 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 c0e8cb764b..014a55c9a7 100644
--- a/src/com/android/settings/users/RestrictedProfileSettings.java
+++ b/src/com/android/settings/users/RestrictedProfileSettings.java
@@ -93,7 +93,7 @@ public class RestrictedProfileSettings extends AppRestrictionsFragment
         } 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));
         }
     }
 
-- 
2.11.0