Revert "Update notification expander background colors" (0eb44286) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16811,7 +16811,7 @@ public class Notification implements Parcelable
	}		}
	}		}
	// make sure every color has a valid value		// make sure every color has a valid value
	mProtectionColor = ctx.getColor(R.color.surface_effect_3);		mProtectionColor = ColorUtils.blendARGB(mPrimaryTextColor, mBackgroundColor, 0.9f);
	mSemanticRedContainerHighColor =		mSemanticRedContainerHighColor =
	ctx.getColor(R.color.materialColorSemanticRedContainerHigh);		ctx.getColor(R.color.materialColorSemanticRedContainerHigh);
	}		}

core/tests/coretests/src/android/app/NotificationTest.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1393,7 +1393,6 @@ public class NotificationTest {

	if (rawColor != Notification.COLOR_DEFAULT) {		if (rawColor != Notification.COLOR_DEFAULT) {
	// When a color is provided, night mode should have no effect on the notification		// When a color is provided, night mode should have no effect on the notification
	// Exception: ProtectionColor will not match, since it has different values for LT/DT
	assertEquals(cDay.getBackgroundColor(), cNight.getBackgroundColor());		assertEquals(cDay.getBackgroundColor(), cNight.getBackgroundColor());
	assertEquals(cDay.getPrimaryTextColor(), cNight.getPrimaryTextColor());		assertEquals(cDay.getPrimaryTextColor(), cNight.getPrimaryTextColor());
	assertEquals(cDay.getSecondaryTextColor(), cNight.getSecondaryTextColor());		assertEquals(cDay.getSecondaryTextColor(), cNight.getSecondaryTextColor());
	@@ -1406,6 +1405,7 @@ public class NotificationTest {
	cNight.getTertiaryFixedDimAccentColor());		cNight.getTertiaryFixedDimAccentColor());
	assertEquals(cDay.getOnTertiaryFixedAccentTextColor(),		assertEquals(cDay.getOnTertiaryFixedAccentTextColor(),
	cNight.getOnTertiaryFixedAccentTextColor());		cNight.getOnTertiaryFixedAccentTextColor());
			assertEquals(cDay.getProtectionColor(), cNight.getProtectionColor());
	assertEquals(cDay.getContrastColor(), cNight.getContrastColor());		assertEquals(cDay.getContrastColor(), cNight.getContrastColor());
	assertEquals(cDay.getRippleAlpha(), cNight.getRippleAlpha());		assertEquals(cDay.getRippleAlpha(), cNight.getRippleAlpha());
	}		}

packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/row/NotificationRowColors.kt

0 → 100644

+65 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2025 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			package com.android.systemui.notifications.ui.composable.row

			import androidx.annotation.FloatRange
			import androidx.compose.material3.MaterialTheme
			import androidx.compose.runtime.Composable
			import androidx.compose.runtime.ReadOnlyComposable
			import androidx.compose.ui.graphics.Color
			import com.android.compose.theme.LocalAndroidColorScheme

			@Composable
			@ReadOnlyComposable
			fun notificationProtectionColor(): Color {
			// Per android.app.Notification.Colors, this is a 90% blend
			// of materialColorOnSurface over materialColorSurfaceContainerHigh
			val background = MaterialTheme.colorScheme.surfaceContainerHigh
			val primaryText = MaterialTheme.colorScheme.onSurface
			return blendARGB(primaryText, background, 0.9f)
			}

			/**
			* Blend between two ARGB colors using the given ratio.
			*
			* A blend ratio of 0.0 will result in [color1], 0.5 will give an even blend, 1.0 will result in
			* [color2].
			*
			* @param color1 the first ARGB color
			* @param color2 the second ARGB color
			* @param ratio the blend ratio of [color1] to [color2]
			* @see [com.android.internal.graphics.ColorUtils.blendARGB]
			*/
			private fun blendARGB(
			color1: Color,
			color2: Color,
			@FloatRange(from = 0.0, to = 1.0) ratio: Float,
			): Color {
			val inverseRatio = 1 - ratio
			return Color(
			red = color1.red * inverseRatio + color2.red * ratio,
			green = color1.green * inverseRatio + color2.green * ratio,
			blue = color1.blue * inverseRatio + color2.blue * ratio,
			alpha = color1.alpha * inverseRatio + color2.alpha * ratio,
			)
			}

			@Composable
			@ReadOnlyComposable
			internal fun bundleHeaderIconBGColor(): Color {
			return LocalAndroidColorScheme.current.surfaceEffect2
			}

packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/row/NotificationRowPrimitives.kt

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -51,7 +51,6 @@ import com.android.compose.animation.scene.ElementKey
	import com.android.compose.animation.scene.LowestZIndexContentPicker		import com.android.compose.animation.scene.LowestZIndexContentPicker
	import com.android.compose.animation.scene.ValueKey		import com.android.compose.animation.scene.ValueKey
	import com.android.compose.animation.scene.animateElementFloatAsState		import com.android.compose.animation.scene.animateElementFloatAsState
	import com.android.compose.theme.LocalAndroidColorScheme

	object NotificationRowPrimitives {		object NotificationRowPrimitives {
	object Elements {		object Elements {
	@@ -69,7 +68,7 @@ object NotificationRowPrimitives {
	/** The Icon displayed at the start of any notification row. */		/** The Icon displayed at the start of any notification row. */
	@Composable		@Composable
	fun BundleIcon(@DrawableRes drawable: Int?, large: Boolean, modifier: Modifier = Modifier) {		fun BundleIcon(@DrawableRes drawable: Int?, large: Boolean, modifier: Modifier = Modifier) {
	val iconBackground = LocalAndroidColorScheme.current.surfaceEffect2		val iconBackground = bundleHeaderIconBGColor()
	Box(		Box(
	modifier =		modifier =
	if (large) {		if (large) {
	@@ -140,7 +139,7 @@ fun ContentScope.ExpansionControl(

	@Composable		@Composable
	private fun ContentScope.PillBackground(modifier: Modifier = Modifier) {		private fun ContentScope.PillBackground(modifier: Modifier = Modifier) {
	val surfaceColor = LocalAndroidColorScheme.current.surfaceEffect3		val surfaceColor = notificationProtectionColor()
	// Needs to be a shared element so it does not overlap while animating		// Needs to be a shared element so it does not overlap while animating
	ElementWithValues(NotificationRowPrimitives.Elements.PillBackground, modifier) {		ElementWithValues(NotificationRowPrimitives.Elements.PillBackground, modifier) {
	Box(		Box(

packages/SystemUI/pods/src/com/android/systemui/notifications/ui/composable/component/Colors.kt

0 → 100644

+64 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2025 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			package com.android.systemui.notifications.ui.composable.component

			import androidx.annotation.FloatRange
			import androidx.compose.material3.MaterialTheme
			import androidx.compose.runtime.Composable
			import androidx.compose.runtime.ReadOnlyComposable
			import androidx.compose.ui.graphics.Color

			// Note: This is forked from
			// frameworks/base/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/row/NotificationRowColors.kt

			// TODO: b/432249649 - Once we move the compose code for bundles into a pod, we should consolidate
			// these duplicated files.

			@Composable
			@ReadOnlyComposable
			internal fun notificationProtectionColor(): Color {
			// Per android.app.Notification.Colors, this is a 90% blend
			// of materialColorOnSurface over materialColorSurfaceContainerHigh
			val background = MaterialTheme.colorScheme.surfaceContainerHigh
			val primaryText = MaterialTheme.colorScheme.onSurface
			return blendARGB(primaryText, background, 0.9f)
			}

			/**
			* Blend between two ARGB colors using the given ratio.
			*
			* A blend ratio of 0.0 will result in [color1], 0.5 will give an even blend, 1.0 will result in
			* [color2].
			*
			* @param color1 the first ARGB color
			* @param color2 the second ARGB color
			* @param ratio the blend ratio of [color1] to [color2]
			* @see [com.android.internal.graphics.ColorUtils.blendARGB]
			*/
			private fun blendARGB(
			color1: Color,
			color2: Color,
			@FloatRange(from = 0.0, to = 1.0) ratio: Float,
			): Color {
			val inverseRatio = 1 - ratio
			return Color(
			red = color1.red * inverseRatio + color2.red * ratio,
			green = color1.green * inverseRatio + color2.green * ratio,
			blue = color1.blue * inverseRatio + color2.blue * ratio,
			alpha = color1.alpha * inverseRatio + color2.alpha * ratio,
			)
			}