diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-11-09 00:51:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-11-09 00:51:04 +0000 |
| commit | b3866aeee2291a64aaf845c8221d6da0bf1a3a2a (patch) | |
| tree | bc6722ec32f4a3917646b19f5edc82c2651dc7a0 | |
| parent | 9eba10e17fd00dba92bc145ee4ea12396cd0ff5e (diff) | |
| parent | e24548dceddd532a0e30ac393a65acece9bb410c (diff) | |
| download | base-b3866aeee2291a64aaf845c8221d6da0bf1a3a2a.tar.gz | |
Merge "Color/tint the wifi/mobile status bar icons correctly"
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java | 6 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/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 689d161c2ee8..239addd4ee1d 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 23e2d277034d..6dbcc44e385b 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); } |