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

Commit 1b8e703f authored Jan 19, 2024 by Steve Elliott Committed by Android (Google) Code Review Jan 19, 2024

Merge "Avoid clobbering SBIV colors in NIC" into main

parents 78288b97 6c48cf39

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -645,6 +645,10 @@ public class StatusBarIconView extends AnimatedImageView implements StatusIconDi
		+ "slot='" + mSlot + "' alpha=" + getAlpha() + " icon=" + mIcon
		+ " visibleState=" + getVisibleStateString(getVisibleState())
		+ " iconColor=#" + Integer.toHexString(mIconColor)
		+ " staticDrawableColor=#" + Integer.toHexString(mDrawableColor)
		+ " decorColor=#" + Integer.toHexString(mDecorColor)
		+ " animationStartColor=#" + Integer.toHexString(mAnimationStartColor)
		+ " currentSetColor=#" + Integer.toHexString(mCurrentSetColor)
		+ " notification=" + mNotification + ')';
		}

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

+9 −2

Original line number	Diff line number	Diff line
		@@ -918,8 +918,15 @@ public class NotificationIconContainer extends ViewGroup {
		}
		}
		icon.setVisibleState(visibleState, animationsAllowed);
		if (NotificationIconContainerRefactor.isEnabled()) {
		if (mOverrideIconColor) {
		icon.setIconColor(mThemedTextColorPrimary,
		/* animate= */ needsCannedAnimation && animationsAllowed);
		}
		} else {
		icon.setIconColor(mOverrideIconColor ? mThemedTextColorPrimary : iconColor,
		needsCannedAnimation && animationsAllowed);
		}
		if (animate) {
		animateTo(icon, animationProperties);
		} else {