Merge "Fix colors of metric-style notifications (when background is colorized)" into main (111725aa) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+11 −4

Original line number	Diff line number	Diff line
		@@ -11806,7 +11806,7 @@ public class Notification implements Parcelable
		final TemplateBindResult result = new TemplateBindResult();
		final RemoteViews contentView = getStandardView(
		mBuilder.getCollapsedMetricLayoutResource(), p, result);
		return bindMetricStyleMetrics(contentView, /* isExpandedView = */false);
		return bindMetricStyleMetrics(contentView, p, /* isExpandedView = */ false);
		}

		/** @hide */
		@@ -11819,7 +11819,7 @@ public class Notification implements Parcelable
		final TemplateBindResult result = new TemplateBindResult();
		final RemoteViews contentView = getStandardView(
		mBuilder.getCollapsedMetricLayoutResource(), p, result);
		return bindMetricStyleMetrics(contentView, /* isExpandedView = */false);
		return bindMetricStyleMetrics(contentView, p, /* isExpandedView = */ false);
		}

		/** @hide */
		@@ -11832,11 +11832,11 @@ public class Notification implements Parcelable
		final TemplateBindResult result = new TemplateBindResult();
		final RemoteViews contentView = getStandardView(
		mBuilder.getExpandedMetricLayoutResource(), p, result);
		return bindMetricStyleMetrics(contentView, /* isExpandedView = */true);
		return bindMetricStyleMetrics(contentView, p, /* isExpandedView = */ true);
		}

		private RemoteViews bindMetricStyleMetrics(
		RemoteViews contentView, boolean isExpandedView) {
		RemoteViews contentView, StandardTemplateParams p, boolean isExpandedView) {
		for (int i = 0; i < MAX_METRICS; i++) {
		final MetricView metricView = MetricView.VIEWS.get(i);
		if (i < mMetrics.size()) {
		@@ -11863,10 +11863,12 @@ public class Notification implements Parcelable
		metric.getLabel());
		}

		mBuilder.setTextViewColorSecondary(contentView, metricView.labelId(), p);
		contentView.setTextViewText(metricView.labelId(), metricLabel);
		if (Flags.metricStyleUnitInLabel()) {
		contentView.setViewVisibility(metricView.unitId(), View.GONE);
		} else if (isExpandedView) {
		mBuilder.setTextViewColorSecondary(contentView, metricView.unitId(), p);
		contentView.setViewVisibility(metricView.unitId(),
		TextUtils.isEmpty(valueString.subtext())
		? View.GONE
		@@ -11877,6 +11879,9 @@ public class Notification implements Parcelable
		if (metricValue instanceof Metric.TimeDifference timeDifference) {
		contentView.setViewVisibility(metricView.textValueId(), View.GONE);
		contentView.setViewVisibility(metricView.chronometerId(), View.VISIBLE);
		mBuilder.setTextViewColorSecondary(contentView, metricView.chronometerId(),
		p);

		contentView.setChronometerCountDown(
		metricView.chronometerId(), timeDifference.isTimer());
		contentView.setBoolean(metricView.chronometerId(),
		@@ -11902,6 +11907,8 @@ public class Notification implements Parcelable
		} else {
		contentView.setViewVisibility(metricView.chronometerId(), View.GONE);
		contentView.setViewVisibility(metricView.textValueId(), View.VISIBLE);
		mBuilder.setTextViewColorSecondary(contentView, metricView.textValueId(),
		p);
		contentView.setTextViewText(metricView.textValueId(), valueString.text());
		}
		} else {