Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I013792798e1b745342be884408c7c288909154a5
This commit is contained in:
Jeff DeCew
2021-03-29 20:27:51 +00:00
committed by Automerger Merge Worker
parent 0288dbaee2 2ea75ab9ce
commit 8e76902477
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/com/android/internal/widget/NotificationExpandButton.java
View File

@@ -20,6 +20,7 @@ import android.annotation.ColorInt;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.content.Context; import android.content.Context;
import android.content.res.ColorStateList; import android.content.res.ColorStateList;
import android.graphics.PorterDuff;
import android.graphics.Rect; import android.graphics.Rect;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.RemotableViewMethod; import android.view.RemotableViewMethod;
@@ -165,11 +166,13 @@ public class NotificationExpandButton extends FrameLayout {
private void updateColors() { private void updateColors() {
if (shouldShowNumber() && !mDisallowColor) { if (shouldShowNumber() && !mDisallowColor) {
mPillView.setBackgroundTintList(ColorStateList.valueOf(mHighlightPillColor)); mPillView.setBackgroundTintList(ColorStateList.valueOf(mHighlightPillColor));
mIconView.setColorFilter(mHighlightTextColor); mPillView.setBackgroundTintMode(PorterDuff.Mode.SRC_IN);
mIconView.setColorFilter(mHighlightTextColor, PorterDuff.Mode.SRC_IN);
mNumberView.setTextColor(mHighlightTextColor); mNumberView.setTextColor(mHighlightTextColor);
} else { } else {
mPillView.setBackgroundTintList(ColorStateList.valueOf(mDefaultPillColor)); mPillView.setBackgroundTintList(ColorStateList.valueOf(mDefaultPillColor));
mIconView.setColorFilter(mDefaultTextColor); mPillView.setBackgroundTintMode(PorterDuff.Mode.SRC_IN);
mIconView.setColorFilter(mDefaultTextColor, PorterDuff.Mode.SRC_IN);
mNumberView.setTextColor(mDefaultTextColor); mNumberView.setTextColor(mDefaultTextColor);
} }
} }