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

Merge "Change color of expand button on notif groups" into sc-dev

Browse Source
This commit is contained in:
Lucas Dupin
2021-03-24 00:49:53 +00:00
committed by Android (Google) Code Review
parent 0b296ebdbe b904a2e608
commit 76ae4090e1
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/java/android/app/Notification.java
View File

@@ -5283,8 +5283,7 @@ public class Notification implements Parcelable
contentView.setInt(R.id.expand_button, "setDefaultPillColor", pillColor);
// Use different highlighted colors except when low-priority mode prevents that
if (!p.mReduceHighlights) {
textColor = getBackgroundColor(p);
pillColor = getAccentColor(p);
pillColor = getAccentTertiaryColor(p);
}
contentView.setInt(R.id.expand_button, "setHighlightTextColor", textColor);
contentView.setInt(R.id.expand_button, "setHighlightPillColor", pillColor);
@@ -6218,6 +6217,25 @@ public class Notification implements Parcelable
return ColorUtils.blendARGB(getPrimaryTextColor(p), getBackgroundColor(p), 0.8f);
}
/**
* Gets the tertiary accent color for colored UI elements. If we're tinting with the theme
* accent, this comes from the tertiary system accent palette, otherwise this would be
* identical to {@link #getSmallIconColor(StandardTemplateParams)}.
*/
private @ColorInt int getAccentTertiaryColor(StandardTemplateParams p) {
if (isColorized(p)) {
return getPrimaryTextColor(p);
}
if (mTintWithThemeAccent) {
int color = obtainThemeColor(com.android.internal.R.attr.colorAccentTertiary,
COLOR_INVALID);
if (color != COLOR_INVALID) {
return color;
}
}
return getContrastColor(p);
}
/**
* Gets the theme's error color, or the primary text color for colorized notifications.
*/