Allow for MR text to grow with font scaling (82c8f5cd) · Commits · e / os / android_frameworks_base

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

+9 −4

Original line number	Original line	Diff line number	Diff line
	@@ -33,9 +33,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape
	import androidx.compose.material3.MaterialTheme		import androidx.compose.material3.MaterialTheme
	import androidx.compose.material3.Text		import androidx.compose.material3.Text
	import androidx.compose.runtime.Composable		import androidx.compose.runtime.Composable
	import androidx.compose.runtime.derivedStateOf
	import androidx.compose.runtime.getValue		import androidx.compose.runtime.getValue
	import androidx.compose.runtime.remember
	import androidx.compose.ui.Alignment		import androidx.compose.ui.Alignment
	import androidx.compose.ui.Modifier		import androidx.compose.ui.Modifier
	import androidx.compose.ui.draw.alpha		import androidx.compose.ui.draw.alpha
	@@ -43,6 +41,7 @@ import androidx.compose.ui.draw.clip
	import androidx.compose.ui.graphics.Color		import androidx.compose.ui.graphics.Color
	import androidx.compose.ui.hapticfeedback.HapticFeedbackType		import androidx.compose.ui.hapticfeedback.HapticFeedbackType
	import androidx.compose.ui.platform.LocalConfiguration		import androidx.compose.ui.platform.LocalConfiguration
			import androidx.compose.ui.platform.LocalDensity
	import androidx.compose.ui.platform.LocalHapticFeedback		import androidx.compose.ui.platform.LocalHapticFeedback
	import androidx.compose.ui.res.stringResource		import androidx.compose.ui.res.stringResource
	import androidx.compose.ui.text.font.FontWeight		import androidx.compose.ui.text.font.FontWeight
	@@ -56,11 +55,17 @@ import com.android.systemui.res.R
	@Composable		@Composable
	fun Chip(action: ActionViewModel, modifier: Modifier = Modifier) {		fun Chip(action: ActionViewModel, modifier: Modifier = Modifier) {
	val backgroundColor = if (isSystemInDarkTheme()) Color.Black else Color.White		val backgroundColor = if (isSystemInDarkTheme()) Color.Black else Color.White
			val density = LocalDensity.current
	val config = LocalConfiguration.current		val config = LocalConfiguration.current
	val isBoldTextEnabled by remember { derivedStateOf { config.fontWeightAdjustment > 0 } }		val isBoldTextEnabled = config.fontWeightAdjustment > 0
			val fontScale = config.fontScale
	val chipTextStyle =		val chipTextStyle =
	MaterialTheme.typography.labelLarge.copy(		MaterialTheme.typography.labelLarge.copy(
	fontWeight = if (isBoldTextEnabled) FontWeight.Bold else FontWeight.Medium		fontWeight = if (isBoldTextEnabled) FontWeight.Bold else FontWeight.Medium,
			fontSize =
			with(density) {
			(MaterialTheme.typography.labelLarge.fontSize.value * fontScale).dp.toSp()
			},
	)		)

	val haptics = LocalHapticFeedback.current		val haptics = LocalHapticFeedback.current

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

+10 −4

Original line number	Original line	Diff line number	Diff line
	@@ -33,6 +33,7 @@ import androidx.compose.foundation.layout.IntrinsicSize
	import androidx.compose.foundation.layout.Row		import androidx.compose.foundation.layout.Row
	import androidx.compose.foundation.layout.Spacer		import androidx.compose.foundation.layout.Spacer
	import androidx.compose.foundation.layout.defaultMinSize		import androidx.compose.foundation.layout.defaultMinSize
			import androidx.compose.foundation.layout.height
	import androidx.compose.foundation.layout.padding		import androidx.compose.foundation.layout.padding
	import androidx.compose.foundation.layout.size		import androidx.compose.foundation.layout.size
	import androidx.compose.foundation.layout.width		import androidx.compose.foundation.layout.width
	@@ -44,7 +45,6 @@ import androidx.compose.material3.MaterialTheme
	import androidx.compose.material3.Text		import androidx.compose.material3.Text
	import androidx.compose.runtime.Composable		import androidx.compose.runtime.Composable
	import androidx.compose.runtime.LaunchedEffect		import androidx.compose.runtime.LaunchedEffect
	import androidx.compose.runtime.derivedStateOf
	import androidx.compose.runtime.getValue		import androidx.compose.runtime.getValue
	import androidx.compose.runtime.mutableStateOf		import androidx.compose.runtime.mutableStateOf
	import androidx.compose.runtime.remember		import androidx.compose.runtime.remember
	@@ -145,10 +145,15 @@ fun NavBarPill(
	label = "expansion",		label = "expansion",
	)		)
	val config = LocalConfiguration.current		val config = LocalConfiguration.current
	val isBoldTextEnabled by remember { derivedStateOf { config.fontWeightAdjustment > 0 } }		val isBoldTextEnabled = config.fontWeightAdjustment > 0
			val fontScale = config.fontScale
	val actionTextStyle =		val actionTextStyle =
	MaterialTheme.typography.labelMedium.copy(		MaterialTheme.typography.labelMedium.copy(
	fontWeight = if (isBoldTextEnabled) FontWeight.Bold else FontWeight.Medium		fontWeight = if (isBoldTextEnabled) FontWeight.Bold else FontWeight.Medium,
			fontSize =
			with(density) {
			(MaterialTheme.typography.labelMedium.fontSize.value * fontScale).dp.toSp()
			},
	)		)

	Box(		Box(
	@@ -254,7 +259,8 @@ fun NavBarPill(
	Color.Transparent		Color.Transparent
	}		}
	)		)
	.padding(4.dp),		.height(28.dp)
			.padding(start = 6.dp, end = 6.dp),
	) {		) {
	Image(		Image(
	painter = rememberDrawablePainter(action.icon.drawable),		painter = rememberDrawablePainter(action.icon.drawable),

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

+8 −2

Original line number	Original line	Diff line number	Diff line
	@@ -136,11 +136,17 @@ fun ShortPill(
	var pillContentSize by remember { mutableStateOf(IntSize.Zero) }		var pillContentSize by remember { mutableStateOf(IntSize.Zero) }
	var pillContentPosition by remember { mutableStateOf(Offset.Zero) }		var pillContentPosition by remember { mutableStateOf(Offset.Zero) }

			val density = LocalDensity.current
	val config = LocalConfiguration.current		val config = LocalConfiguration.current
	val isBoldTextEnabled by remember { derivedStateOf { config.fontWeightAdjustment > 0 } }		val isBoldTextEnabled by remember { derivedStateOf { config.fontWeightAdjustment > 0 } }
			val fontScale = config.fontScale
	val actionTextStyle =		val actionTextStyle =
	MaterialTheme.typography.labelMedium.copy(		MaterialTheme.typography.labelMedium.copy(
	fontWeight = if (isBoldTextEnabled) FontWeight.Bold else FontWeight.Medium		fontWeight = if (isBoldTextEnabled) FontWeight.Bold else FontWeight.Medium,
			fontSize =
			with(density) {
			(MaterialTheme.typography.labelMedium.fontSize.value * fontScale).dp.toSp()
			},
	)		)

	Box(		Box(
	@@ -254,7 +260,7 @@ fun ShortPill(

	// The layout for the expanded state (a single, centered button)		// The layout for the expanded state (a single, centered button)
	if (expansionAlpha < 1f && pillContentSize != IntSize.Zero) {		if (expansionAlpha < 1f && pillContentSize != IntSize.Zero) {
	with(LocalDensity.current) {		with(density) {
	val offsetX =		val offsetX =
	pillContentPosition.x.toDp() + (pillContentSize.width.toDp() / 2) -		pillContentPosition.x.toDp() + (pillContentSize.width.toDp() / 2) -
	(closeButtonSize / 2)		(closeButtonSize / 2)