From 542aebc43be7c669f66c283fb1756e076d49bc8a Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Fri, 4 Aug 2017 11:24:06 -0700 Subject: [PATCH] User avatar didn't have enough contrast Change-Id: Ia2f02dee48ff211a56f11c259ed89524a260988c Fixes: 64384147 Test: set wallpapers, switch current user --- .../systemui/statusbar/phone/KeyguardStatusBarView.java | 4 ++++ .../systemui/statusbar/policy/UserInfoControllerImpl.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java index 881de67306b1f..a6691b1656df1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java @@ -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) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserInfoControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserInfoControllerImpl.java index b1e4b03bb5b74..527addf11da5b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserInfoControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserInfoControllerImpl.java @@ -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