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

Commit 4bd0e0e7 authored by Evan Laird's avatar Evan Laird Committed by android-build-merger
Browse files

Merge "Fix icon tinting when in split screen" into pi-dev 

am: 2edaf624

Change-Id: Id7e3fa40eae27514ccf247545cb2e6f40c13c412
parents 95356492 2edaf624

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

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.statusbar;



import static com.android.systemui.statusbar.policy.DarkIconDispatcher.getTint;

import static com.android.systemui.statusbar.policy.DarkIconDispatcher.isInArea;



import android.content.Context;

import android.content.res.ColorStateList;
@@ -161,6 +162,9 @@ public class StatusBarMobileView extends AlphaOptimizedLinearLayout implements D 


    @Override

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

        if (!isInArea(area, this)) {

            return;

        }

        mMobileDrawable.setDarkIntensity(darkIntensity);

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

        mIn.setImageTintList(color);

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

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.statusbar;



import static com.android.systemui.statusbar.policy.DarkIconDispatcher.getTint;

import static com.android.systemui.statusbar.policy.DarkIconDispatcher.isInArea;



import android.content.Context;

import android.content.res.ColorStateList;
@@ -175,6 +176,9 @@ public class StatusBarWifiView extends AlphaOptimizedLinearLayout implements Dar 


    @Override

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

        if (!isInArea(area, this)) {

            return;

        }

        mDarkIntensity = darkIntensity;

        Drawable d = mWifiIcon.getDrawable();

        if (d instanceof NeutralGoodDrawable) {

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java

+8 −1
Original line number Diff line number Diff line
@@ -125,7 +125,14 @@ public class NotificationIconAreaController implements DarkReceiver { 
        } else {

            mTintArea.set(tintArea);

        }

        if (mNotificationIconArea != null) {

            if (DarkIconDispatcher.isInArea(tintArea, mNotificationIconArea)) {

                mIconTint = iconTint;

            }

        } else {

            mIconTint = iconTint;

        }



        applyNotificationIconsTint();

    }