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

Commit 4cef646e authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "User avatar didn't have enough contrast" into oc-dr1-dev

parents 75176be7 542aebc4

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import com.android.systemui.statusbar.policy.DarkIconDispatcher.DarkReceiver; 
import com.android.systemui.statusbar.policy.KeyguardUserSwitcher;

import com.android.systemui.statusbar.policy.UserInfoController;

import com.android.systemui.statusbar.policy.UserInfoController.OnUserInfoChangedListener;

import com.android.systemui.statusbar.policy.UserInfoControllerImpl;

import com.android.systemui.statusbar.policy.UserSwitcherController;



/**
@@ -346,6 +347,9 @@ public class KeyguardStatusBarView extends RelativeLayout 
        applyDarkness(R.id.signal_cluster, tintArea, intensity, iconColor);

        applyDarkness(R.id.battery, tintArea, intensity, iconColor);

        applyDarkness(R.id.clock, tintArea, intensity, iconColor);

        // Reload user avatar

        ((UserInfoControllerImpl) Dependency.get(UserInfoController.class))

                .onDensityOrFontScaleChanged();

    }



    private void applyDarkness(int id, Rect tintArea, float intensity, int color) {

packages/SystemUI/src/com/android/systemui/statusbar/policy/UserInfoControllerImpl.java

+2 −1
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ public class UserInfoControllerImpl implements UserInfoController { 
        final int userId = userInfo.id;

        final boolean isGuest = userInfo.isGuest();

        final String userName = userInfo.name;

        final boolean lightIcon = mContext.getThemeResId() != R.style.Theme_SystemUI_Light;



        final Resources res = mContext.getResources();

        final int avatarSize = Math.max(
@@ -154,7 +155,7 @@ public class UserInfoControllerImpl implements UserInfoController { 
                            .setIcon(rawAvatar).setBadgeIfManagedUser(mContext, userId).bake();

                } else {

                    avatar = UserIcons.getDefaultUserIcon(isGuest? UserHandle.USER_NULL : userId,

                            /* light= */ true);

                            lightIcon);

                }



                // If it's a single-user device, get the profile name, since the nickname is not