From 5bf8cd7a095a24345f317c4689d5e765ee0e171b Mon Sep 17 00:00:00 2001
From: Avinash Vadlamudi <avivadla@google.com>
Date: Fri, 3 Jun 2022 10:22:31 +0000
Subject: [PATCH] Rename method for better readability

- Rename encircle to encircleUserIcon for proper readability

Bug: 231592331
Test: build, manual check
Change-Id: If9e829372834d8a5f43e4cce358e8c0975fa30eb
(cherry picked from commit 1b7e41131594edfd19eefb4f926f3a2c352bb4cb)
---
 src/com/android/settings/users/UserSettings.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index e38722e5efe..ca03e3fe7d3 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -517,7 +517,7 @@ public class UserSettings extends SettingsPreferenceFragment
         int myUserId = UserHandle.myUserId();
         Bitmap b = mUserManager.getUserIcon(myUserId);
         if (b != null) {
-            mMePreference.setIcon(encircle(b));
+            mMePreference.setIcon(encircleUserIcon(b));
             mUserIcons.put(myUserId, b);
         }
     }
@@ -1404,7 +1404,7 @@ public class UserSettings extends SettingsPreferenceFragment
                 Drawable icon = getContext().getDrawable(R.drawable.ic_account_circle_outline);
                 icon.setTint(
                         getColorAttrDefaultColor(getContext(), android.R.attr.colorControlNormal));
-                pref.setIcon(encircle(
+                pref.setIcon(encircleUserIcon(
                         UserIcons.convertToBitmapAtUserIconSize(
                                 getContext().getResources(), icon)));
             } else {
@@ -1570,7 +1570,7 @@ public class UserSettings extends SettingsPreferenceFragment
 
     private Drawable getEncircledDefaultIcon() {
         if (mDefaultIconDrawable == null) {
-            mDefaultIconDrawable = encircle(
+            mDefaultIconDrawable = encircleUserIcon(
                     getDefaultUserIconAsBitmap(getContext().getResources(), UserHandle.USER_NULL));
         }
         return mDefaultIconDrawable;
@@ -1579,7 +1579,7 @@ public class UserSettings extends SettingsPreferenceFragment
     private void setPhotoId(Preference pref, UserInfo user) {
         Bitmap bitmap = mUserIcons.get(user.id);
         if (bitmap != null) {
-            pref.setIcon(encircle(bitmap));
+            pref.setIcon(encircleUserIcon(bitmap));
         }
     }
 
@@ -1642,7 +1642,7 @@ public class UserSettings extends SettingsPreferenceFragment
         return false;
     }
 
-    private Drawable encircle(Bitmap icon) {
+    private Drawable encircleUserIcon(Bitmap icon) {
         return new CircleFramedDrawable(
                 icon,
                 getActivity().getResources().getDimensionPixelSize(