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

Commit 8e769024 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Fix color filter on NotificationExpandButton's chevron" into sc-dev am: 2ea75ab9 

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

Change-Id: I013792798e1b745342be884408c7c288909154a5
parents 0288dbae 2ea75ab9

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);

        }

    }