Merge "Always highlight unread count" into sc-dev am: 834bf3a8e0 am: 07952f728a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14805378

Change-Id: I8d9592ad564523e848e5276815e4848f3045bc3a

core/java/com/android/internal/widget/NotificationExpandButton.java

@@ -52,7 +52,6 @@ public class NotificationExpandButton extends FrameLayout {
     private int mDefaultTextColor;
     private int mHighlightPillColor;
     private int mHighlightTextColor;
-    private boolean mDisallowColor;
 
     public NotificationExpandButton(Context context) {
         this(context, null, 0, 0);
@@ -108,14 +107,6 @@ public class NotificationExpandButton extends FrameLayout {
         return super.pointInView(localX, localY, slop);
     }
 
-    /**
-     * Disable the use of the accent colors for this view, if true.
-     */
-    public void setGrayedOut(boolean shouldApply) {
-        mDisallowColor = shouldApply;
-        updateColors();
-    }
-
     @Override
     public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
         super.onInitializeAccessibilityNodeInfo(info);
@@ -164,7 +155,7 @@ public class NotificationExpandButton extends FrameLayout {
     }
 
     private void updateColors() {
-        if (shouldShowNumber() && !mDisallowColor) {
+        if (shouldShowNumber()) {
             if (mHighlightPillColor != 0) {
                 mPillView.setBackgroundTintList(ColorStateList.valueOf(mHighlightPillColor));
             }