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

Revert color of expand button on unread conversations

Browse Source 
Fixes: 183710694
Test: manual
Change-Id: I2cc6d98f9a8ede430a69a7d37ec32c05e41b8759
This commit is contained in:
Jeff DeCew
2021-04-05 17:05:22 -04:00
parent 6a39b82e8b
commit 57851315bd
1 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5360,12 +5360,8 @@ public class Notification implements Parcelable
contentView.setInt(R.id.expand_button, "setDefaultPillColor", pillColor);
// Use different highlighted colors for conversations' unread count
if (p.mHighlightExpander) {
pillColor = getAccentTertiaryColor(p);
// TODO(b/183710694): The accent tertiary is currently too bright in dark mode, so
// we need to pick a contrasting color.
textColor = ColorUtils.setAlphaComponent(
ContrastColorUtil.resolvePrimaryColor(mContext, pillColor, mInNightMode),
0xFF);
textColor = getBackgroundColor(p);
pillColor = getAccentColor(p);
}
contentView.setInt(R.id.expand_button, "setHighlightTextColor", textColor);
contentView.setInt(R.id.expand_button, "setHighlightPillColor", pillColor);
@@ -6295,23 +6291,6 @@ 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);
}
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.
*/