Merge "Fix progress bar color in foreground notifications" into qt-dev

am: 6b8db61901

Change-Id: I33c01bf4017764fee9b14095eb1da6ecfb6ab073
This commit is contained in:
Beth Thibodeau
2019-05-10 06:30:22 -07:00
committed by android-build-merger

View File

@@ -4886,7 +4886,8 @@ public class Notification implements Parcelable
R.id.progress, ColorStateList.valueOf(mContext.getColor(
R.color.notification_progress_background_color)));
if (getRawColor(p) != COLOR_DEFAULT) {
ColorStateList colorStateList = ColorStateList.valueOf(resolveContrastColor(p));
int color = isColorized(p) ? getPrimaryTextColor(p) : resolveContrastColor(p);
ColorStateList colorStateList = ColorStateList.valueOf(color);
contentView.setProgressTintList(R.id.progress, colorStateList);
contentView.setProgressIndeterminateTintList(R.id.progress, colorStateList);
}