Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Color/tint the wifi/mobile status bar icons correctly"

Browse Source 
am: b3866aeee2

Change-Id: Ie60f806f1d9ca6ef99cefe422685b9545adfbb79
This commit is contained in:
Edward Savage-Jones
2019-11-08 17:11:26 -08:00
committed by android-build-merger
parent 05406a1175 b3866aeee2
commit 337b8a6185
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java
View File

@@ -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);

16
packages/SystemUI/src/com/android/systemui/statusbar/StatusBarWifiView.java
View File

@@ -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);
}