Merge "Update phishing alert icon color to semantic red" into main (89ee1bd4) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+12 −1

Original line number	Diff line number	Diff line
		@@ -6051,7 +6051,7 @@ public class Notification implements Parcelable
		contentView.setDrawableTint(
		R.id.phishing_alert,
		false /* targetBackground */,
		getPrimaryTextColor(p),
		getColors(p).getSemanticRedContainerHighColor(),
		PorterDuff.Mode.SRC_ATOP);
		}

		@@ -16757,6 +16757,7 @@ public class Notification implements Parcelable
		private int mOnTertiaryFixedAccentTextColor = COLOR_INVALID;

		private int mErrorColor = COLOR_INVALID;
		private int mSemanticRedContainerHighColor = COLOR_INVALID;
		private int mContrastColor = COLOR_INVALID;
		private int mRippleAlpha = 0x33;

		@@ -16907,6 +16908,8 @@ public class Notification implements Parcelable
		}
		// make sure every color has a valid value
		mProtectionColor = ColorUtils.blendARGB(mPrimaryTextColor, mBackgroundColor, 0.9f);
		mSemanticRedContainerHighColor =
		ctx.getColor(R.color.materialColorSemanticRedContainerHigh);
		}

		/** calculates the contrast color for the non-colorized notifications */
		@@ -16997,6 +17000,14 @@ public class Notification implements Parcelable
		return mErrorColor;
		}

		/**
		* @return the semantic red container high color. Used for elements that are related to
		* safety, security, and privacy.
		*/
		public @ColorInt int getSemanticRedContainerHighColor() {
		return mSemanticRedContainerHighColor;
		}

		/** @return the alpha component of the current theme's control highlight color */
		public int getRippleAlpha() {
		return mRippleAlpha;

+1 −0

Original line number	Diff line number	Diff line
		@@ -130,6 +130,7 @@
		<color name="materialColorSecondary">@color/system_secondary_dark</color>
		<color name="materialColorSecondaryContainer">@color/system_secondary_container_dark</color>
		<color name="materialColorSecondaryDim">@color/system_secondary_dim_dark</color>
		<color name="materialColorSemanticRedContainerHigh">@color/system_semantic_red_container_high_dark</color>
		<color name="materialColorShadow">@color/system_shadow_dark</color>
		<color name="materialColorSurface">@color/system_surface_dark</color>
		<color name="materialColorSurfaceBright">@color/system_surface_bright_dark</color>

+2 −0

Original line number	Diff line number	Diff line
		@@ -586,6 +586,7 @@
		<color name="system_secondary_light">#585F72</color>
		<color name="system_secondary_container_light">#DCE2F9</color>
		<color name="system_secondary_dim_light">#4C5366</color>
		<color name="system_semantic_red_container_high_light">#DB372D</color>
		<color name="system_shadow_light">#000000</color>
		<color name="system_surface_light">#FAF8FE</color>
		<color name="system_surface_bright_light">#FAF8FE</color>
		@@ -641,6 +642,7 @@
		<color name="system_secondary_dark">#C0C6DC</color>
		<color name="system_secondary_container_dark">#353B4D</color>
		<color name="system_secondary_dim_dark">#B2B8CE</color>
		<color name="system_semantic_red_container_high_dark">#F55E57</color>
		<color name="system_shadow_dark">#000000</color>
		<color name="system_surface_dark">#0D0E12</color>
		<color name="system_surface_bright_dark">#292C34</color>

+1 −0

Original line number	Diff line number	Diff line
		@@ -130,6 +130,7 @@
		<color name="materialColorSecondary">@color/system_secondary_light</color>
		<color name="materialColorSecondaryContainer">@color/system_secondary_container_light</color>
		<color name="materialColorSecondaryDim">@color/system_secondary_dim_light</color>
		<color name="materialColorSemanticRedContainerHigh">@color/system_semantic_red_container_high_light</color>
		<color name="materialColorShadow">@color/system_shadow_light</color>
		<color name="materialColorSurface">@color/system_surface_light</color>
		<color name="materialColorSurfaceBright">@color/system_surface_bright_light</color>

+1 −0

Original line number	Diff line number	Diff line
		@@ -5705,6 +5705,7 @@
		<java-symbol name="materialColorSecondary" type="color"/>
		<java-symbol name="materialColorSecondaryContainer" type="color"/>
		<java-symbol name="materialColorSecondaryDim" type="color"/>
		<java-symbol name="materialColorSemanticRedContainerHigh" type="color"/>
		<java-symbol name="materialColorShadow" type="color"/>
		<java-symbol name="materialColorSurface" type="color"/>
		<java-symbol name="materialColorSurfaceBright" type="color"/>