Merge "[RONs] Allow text color spans when promoted" into main (88384179) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -7134,7 +7134,9 @@ public class Notification implements Parcelable
		*/
		public CharSequence ensureColorSpanContrastOrStripStyling(CharSequence cs,
		int buttonFillColor) {
		if (Flags.cleanUpSpansAndNewLines()) {
		// Ongoing promoted notifications are allowed to have styling.
		final boolean isPromotedOngoing = mN.isPromotedOngoing();
		if (!isPromotedOngoing && Flags.cleanUpSpansAndNewLines()) {
		return stripStyling(cs);
		}

		@@ -8686,7 +8688,9 @@ public class Notification implements Parcelable

		// Replace the text with the big text, but only if the big text is not empty.
		CharSequence bigTextText = mBuilder.processLegacyText(mBigText);
		if (Flags.cleanUpSpansAndNewLines()) {
		// Ongoing promoted notifications are allowed to have styling.
		final boolean isPromotedOngoing = mBuilder.mN.isPromotedOngoing();
		if (!isPromotedOngoing && Flags.cleanUpSpansAndNewLines()) {
		bigTextText = normalizeBigText(stripStyling(bigTextText));
		}
		if (!TextUtils.isEmpty(bigTextText)) {