Merge "Color/tint the wifi/mobile status bar icons correctly" am: b3866aeee2 (fb0d8dc5) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -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);

+7 −9

Original line number	Diff line number	Diff line
		@@ -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);
		}