diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java | 4 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconContainer.java | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java index 7a2e82f24f46..bb6ee24b0ffe 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java @@ -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 + ')'; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconContainer.java index f34a44a5c4b0..be5c6b3ba069 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconContainer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconContainer.java @@ -918,8 +918,15 @@ public class NotificationIconContainer extends ViewGroup { } } icon.setVisibleState(visibleState, animationsAllowed); - icon.setIconColor(mOverrideIconColor ? mThemedTextColorPrimary : iconColor, - needsCannedAnimation && 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 { |