Merge "[Dual Shade] Adjust shade header colors and style to match the spec." into main (48d63867) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeHeader.kt

+3 −3

Original line number	Diff line number	Diff line
		@@ -155,7 +155,7 @@ object ShadeHeader {

		data object Weak : ChipHighlight {
		override val backgroundColor: Color
		@Composable get() = MaterialTheme.colorScheme.surface.copy(alpha = 0.1f)
		@Composable get() = MaterialTheme.colorScheme.surface.copy(alpha = 0.3f)

		override val foregroundColor: Color
		@Composable get() = MaterialTheme.colorScheme.onSurface
		@@ -163,10 +163,10 @@ object ShadeHeader {

		data object Strong : ChipHighlight {
		override val backgroundColor: Color
		@Composable get() = MaterialTheme.colorScheme.primaryContainer
		@Composable get() = MaterialTheme.colorScheme.secondary

		override val foregroundColor: Color
		@Composable get() = MaterialTheme.colorScheme.onPrimaryContainer
		@Composable get() = MaterialTheme.colorScheme.onSecondary
		}
		}
		}

+4 −2

Original line number	Diff line number	Diff line
		package com.android.systemui.shade.ui.composable

		import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
		import androidx.compose.material3.MaterialTheme
		import androidx.compose.material3.Text
		import androidx.compose.runtime.Composable
		@@ -7,6 +8,7 @@ import androidx.compose.ui.Modifier
		import androidx.compose.ui.graphics.Color
		import androidx.compose.ui.layout.Layout

		@OptIn(ExperimentalMaterial3ExpressiveApi::class)
		@Composable
		fun VariableDayDate(
		longerDateText: String,
		@@ -20,7 +22,7 @@ fun VariableDayDate(
		{
		Text(
		text = longerDateText,
		style = MaterialTheme.typography.bodyMedium,
		style = MaterialTheme.typography.labelLargeEmphasized,
		color = textColor,
		maxLines = 1,
		)
		@@ -28,7 +30,7 @@ fun VariableDayDate(
		{
		Text(
		text = shorterDateText,
		style = MaterialTheme.typography.bodyMedium,
		style = MaterialTheme.typography.labelLargeEmphasized,
		color = textColor,
		maxLines = 1,
		)