Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acfb30b9 authored by Edward Savage-Jones's avatar Edward Savage-Jones Committed by android-build-merger
Browse files

Merge "Color/tint the wifi/mobile status bar icons correctly" am: b3866aee am: 337b8a61 

am: fb0d8dc5

Change-Id: I9056e3f773355a61a64531973a5486e177739633
parents 889043a6 fb0d8dc5

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

+2 −4
Original line number Original line Diff line number Diff line
@@ -208,11 +208,9 @@ public class StatusBarMobileView extends FrameLayout implements DarkReceiver, 




    @Override

    @Override

    public void onDarkChanged(Rect area, float darkIntensity, int tint) {

    public void onDarkChanged(Rect area, float darkIntensity, int tint) {

        if (!isInArea(area, this)) {

        float intensity = isInArea(area, this) ? darkIntensity : 0;

            return;

        }

        mMobileDrawable.setTintList(

        mMobileDrawable.setTintList(

                ColorStateList.valueOf(mDualToneHandler.getSingleColor(darkIntensity)));

                ColorStateList.valueOf(mDualToneHandler.getSingleColor(intensity)));

        ColorStateList color = ColorStateList.valueOf(getTint(area, this, tint));

        ColorStateList color = ColorStateList.valueOf(getTint(area, this, tint));

        mIn.setImageTintList(color);

        mIn.setImageTintList(color);

        mOut.setImageTintList(color);

        mOut.setImageTintList(color);

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

+7 −9
Original line number Original line Diff line number Diff line
@@ -236,15 +236,13 @@ public class StatusBarWifiView extends FrameLayout implements DarkReceiver, 




    @Override

    @Override

    public void onDarkChanged(Rect area, float darkIntensity, int tint) {

    public void onDarkChanged(Rect area, float darkIntensity, int tint) {

        if (!isInArea(area, this)) {

        int areaTint = getTint(area, this, tint);

            return;

        ColorStateList color = ColorStateList.valueOf(areaTint);

        }

        mWifiIcon.setImageTintList(color);



        mIn.setImageTintList(color);

        mWifiIcon.setImageTintList(ColorStateList.valueOf(getTint(area, this, tint)));

        mOut.setImageTintList(color);

        mIn.setImageTintList(ColorStateList.valueOf(getTint(area, this, tint)));

        mDotView.setDecorColor(areaTint);

        mOut.setImageTintList(ColorStateList.valueOf(getTint(area, this, tint)));

        mDotView.setIconColor(areaTint, false);

        mDotView.setDecorColor(tint);

        mDotView.setIconColor(tint, false);

    }

    }