From e24548dceddd532a0e30ac393a65acece9bb410c Mon Sep 17 00:00:00 2001 From: Edward Savage-Jones Date: Sat, 19 Oct 2019 22:29:31 +0200 Subject: [PATCH] Color/tint the wifi/mobile status bar icons correctly When in split screen the Wifi and mobile status bar can sometimes end up in a state where they are tinted dark when they should be light and vice versa. This fixes that issue. Bug: 142921186 Test: Manual - see buganizer Change-Id: I2ac11db8048de1b2fb225d561ec34fda5000e3fe --- .../systemui/statusbar/StatusBarMobileView.java | 6 ++---- .../systemui/statusbar/StatusBarWifiView.java | 16 +++++++--------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java index 689d161c2ee86..239addd4ee1d1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java @@ -208,11 +208,9 @@ public class StatusBarMobileView extends FrameLayout implements DarkReceiver, @Override public void onDarkChanged(Rect area, float darkIntensity, int tint) { - if (!isInArea(area, this)) { - return; - } + float intensity = isInArea(area, this) ? darkIntensity : 0; mMobileDrawable.setTintList( - ColorStateList.valueOf(mDualToneHandler.getSingleColor(darkIntensity))); + ColorStateList.valueOf(mDualToneHandler.getSingleColor(intensity))); ColorStateList color = ColorStateList.valueOf(getTint(area, this, tint)); mIn.setImageTintList(color); mOut.setImageTintList(color); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarWifiView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarWifiView.java index 23e2d277034da..6dbcc44e385b7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarWifiView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarWifiView.java @@ -236,15 +236,13 @@ public class StatusBarWifiView extends FrameLayout implements DarkReceiver, @Override public void onDarkChanged(Rect area, float darkIntensity, int tint) { - if (!isInArea(area, this)) { - return; - } - - mWifiIcon.setImageTintList(ColorStateList.valueOf(getTint(area, this, tint))); - mIn.setImageTintList(ColorStateList.valueOf(getTint(area, this, tint))); - mOut.setImageTintList(ColorStateList.valueOf(getTint(area, this, tint))); - mDotView.setDecorColor(tint); - mDotView.setIconColor(tint, false); + int areaTint = getTint(area, this, tint); + ColorStateList color = ColorStateList.valueOf(areaTint); + mWifiIcon.setImageTintList(color); + mIn.setImageTintList(color); + mOut.setImageTintList(color); + mDotView.setDecorColor(areaTint); + mDotView.setIconColor(areaTint, false); }