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
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java
index 689d161..239addd 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 @@
@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 23e2d27..6dbcc44 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 @@
@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);
}
