Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bf8cd7a authored by Avinash Vadlamudi's avatar Avinash Vadlamudi
Browse files

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 1b7e4113)
parent d23aba70

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

+5 −5
Original line number Diff line number Diff line
@@ -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(