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

Commit 2ea75ab9 authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge "Fix color filter on NotificationExpandButton's chevron" into sc-dev

parents 10d69bfd a29c7b91

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

+5 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.annotation.ColorInt; 
import android.annotation.Nullable;

import android.content.Context;

import android.content.res.ColorStateList;

import android.graphics.PorterDuff;

import android.graphics.Rect;

import android.util.AttributeSet;

import android.view.RemotableViewMethod;
@@ -165,11 +166,13 @@ public class NotificationExpandButton extends FrameLayout { 
    private void updateColors() {

        if (shouldShowNumber() && !mDisallowColor) {

            mPillView.setBackgroundTintList(ColorStateList.valueOf(mHighlightPillColor));

            mIconView.setColorFilter(mHighlightTextColor);

            mPillView.setBackgroundTintMode(PorterDuff.Mode.SRC_IN);

            mIconView.setColorFilter(mHighlightTextColor, PorterDuff.Mode.SRC_IN);

            mNumberView.setTextColor(mHighlightTextColor);

        } else {

            mPillView.setBackgroundTintList(ColorStateList.valueOf(mDefaultPillColor));

            mIconView.setColorFilter(mDefaultTextColor);

            mPillView.setBackgroundTintMode(PorterDuff.Mode.SRC_IN);

            mIconView.setColorFilter(mDefaultTextColor, PorterDuff.Mode.SRC_IN);

            mNumberView.setTextColor(mDefaultTextColor);

        }

    }