From 6ebc218ad552428d913b29e7ca4a0d8464db5d0d Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Tue, 18 Jul 2017 12:15:41 -0700 Subject: [PATCH] Choose correct icon shade of grey Status bar icons should pick colors from icon themes instead of lock screen text colors. Test: Visual Change-Id: I0460ec38c8193f6311a47b4774357d8d3347a8d2 Fixes: 63618424 --- .../statusbar/phone/KeyguardStatusBarView.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) 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 c1581c835a9ca..881de67306b1f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java @@ -334,16 +334,18 @@ public class KeyguardStatusBarView extends RelativeLayout public void onOverlayChanged() { @ColorInt int textColor = Utils.getColorAttr(mContext, R.attr.wallpaperTextColor); - mCarrierLabel.setTextColor(textColor); - mBatteryView.setFillColor(textColor); - mIconManager.setTint(textColor); - + @ColorInt int iconColor = Utils.getDefaultColor(mContext, Color.luminance(textColor) < 0.5 ? + R.color.dark_mode_icon_color_single_tone : + R.color.light_mode_icon_color_single_tone); float intensity = textColor == Color.WHITE ? 0 : 1; + mCarrierLabel.setTextColor(iconColor); + mBatteryView.setFillColor(iconColor); + mIconManager.setTint(iconColor); Rect tintArea = new Rect(0, 0, 0, 0); - applyDarkness(R.id.signal_cluster, tintArea, intensity, textColor); - applyDarkness(R.id.battery, tintArea, intensity, textColor); - applyDarkness(R.id.clock, tintArea, intensity, textColor); + applyDarkness(R.id.signal_cluster, tintArea, intensity, iconColor); + applyDarkness(R.id.battery, tintArea, intensity, iconColor); + applyDarkness(R.id.clock, tintArea, intensity, iconColor); } private void applyDarkness(int id, Rect tintArea, float intensity, int color) {