Merge "Update MR icon color, cue bar icon size and font color." into main (b6442ddb) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/ambientcue/ui/compose/ShortPill.kt

+6 −6

Original line number	Diff line number	Diff line
		@@ -95,7 +95,6 @@ fun ShortPill(
		onCloseClick: () -> Unit = {},
		onAnimationStateChange: (Int, AmbientCueAnimationState) -> Unit = { _, _ -> },
		) {
		val outlineColor = if (isSystemInDarkTheme()) Color.White else Color.Black
		val backgroundColor = if (isSystemInDarkTheme()) Color.Black else Color.White
		val scrimColor = MaterialTheme.colorScheme.primaryFixedDim
		val minSize = 48.dp
		@@ -279,7 +278,7 @@ fun ShortPill(
		if (actions.size == 1) {
		Text(
		text = action.label,
		color = outlineColor,
		color = MaterialTheme.colorScheme.onSurface,
		style = actionTextStyle,
		overflow = TextOverflow.Ellipsis,
		maxLines = 1,
		@@ -292,7 +291,7 @@ fun ShortPill(
		) {
		Text(
		text = action.label,
		color = outlineColor,
		color = MaterialTheme.colorScheme.onSurface,
		style = actionTextStyle,
		overflow = TextOverflow.Ellipsis,
		maxLines = 1,
		@@ -404,13 +403,14 @@ private fun Icon(action: ActionViewModel, backgroundColor: Color, modifier: Modi
		contentDescription = stringResource(id = R.string.ambient_cue_icon_content_description),
		modifier =
		modifier
		.padding(2.dp)
		.then(
		if (action.actionType == ActionType.MR) {
		Modifier.size(20.dp)
		Modifier.size(16.dp)
		} else {
		Modifier.size(19.25.dp)
		Modifier.size(16.dp)
		.border(
		width = 0.75.dp,
		width = 0.5.dp,
		color = MaterialTheme.colorScheme.outline,
		shape = CircleShape,
		)

+3 −3

Original line number	Diff line number	Diff line
		@@ -29,12 +29,12 @@
		android:pathData="M0,0h24v24h-24z"/>
		<path
		android:pathData="M19.5,4.5C18.5,3.5 18,2.3 18,1C18,2.4 17.5,3.6 16.5,4.5C15.5,5.5 14.3,6 13,6C14.4,6 15.6,6.5 16.5,7.5C17.4,8.5 18,9.7 18,11C18,9.6 18.5,8.4 19.5,7.5C20.5,6.6 21.7,6 23,6C21.6,6 20.4,5.5 19.5,4.5Z"
		android:fillColor="@androidprv:color/materialColorOnSecondaryContainer"/>
		android:fillColor="@androidprv:color/materialColorOnSurface"/>
		<path
		android:pathData="M14.32,10.4C14.83,10 14.2,9.2 13.69,9.59C11.18,11.4 9.16,12.55 7,13.72V3H15V1H7C5.9,1 5,1.9 5,3V8.19C3.74,9.44 2.65,10.81 1.79,12.4C1.01,13.7 0.33,16.28 2.32,16.86C3.25,17.11 4.14,16.82 4.92,16.53C5.03,16.48 7.5,15.83 14.32,10.4ZM3.01,15.01C3.32,13.82 4.08,12.68 5,11.65V14.63C4.35,14.86 3.69,15.01 3.01,15.01Z"
		android:fillColor="@androidprv:color/materialColorOnSecondaryContainer"/>
		android:fillColor="@androidprv:color/materialColorOnSurface"/>
		<path
		android:pathData="M16,21H7V17.78C5.81,18.37 5.52,18.46 5,18.62V21C5,22.1 5.9,23 7,23H16C17.1,23 18,22.1 18,21V12H16V21Z"
		android:fillColor="@androidprv:color/materialColorOnSecondaryContainer"/>
		android:fillColor="@androidprv:color/materialColorOnSurface"/>
		</group>
		</vector>
		No newline at end of file