Merge "[Spa] Update typography and dimension" into main (aaa9fb44) · Commits · e / os / android_frameworks_base

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/theme/SettingsDimension.kt

+9 −6

Original line number	Diff line number	Diff line
		@@ -20,14 +20,17 @@ import androidx.compose.foundation.layout.PaddingValues
		import androidx.compose.ui.unit.dp

		object SettingsDimension {
		val extraSmall2 = 4.dp
		val extraSmall3 = 6.dp
		val extraSmall4 = 8.dp
		val extraSmall5 = 10.dp
		val extraSmall6 = 12.dp
		val small1 = 16.dp
		val small4 = 24.dp

		val paddingTiny = 2.dp
		val paddingExtraSmall = 4.dp
		val paddingExtraSmall1 = 6.dp
		val paddingExtraSmall3 = 6.dp
		val paddingExtraSmall5 = 10.dp
		val paddingExtraSmall6 = 12.dp
		val paddingSmall = if (isSpaExpressiveEnabled) 8.dp else 4.dp
		val paddingSmall1 = 16.dp
		val paddingLarge = 16.dp
		val paddingExtraLarge = 24.dp
		val paddingExtraLarge1 = 28.dp
		@@ -43,7 +46,7 @@ object SettingsDimension {
		val itemIconContainerSize = 72.dp
		val itemPaddingStart = if (isSpaExpressiveEnabled) paddingLarge else paddingExtraLarge
		val itemPaddingEnd = paddingLarge
		val itemPaddingVertical = if (isSpaExpressiveEnabled) paddingExtraSmall6 else paddingLarge
		val itemPaddingVertical = if (isSpaExpressiveEnabled) extraSmall6 else paddingLarge
		val itemPadding = PaddingValues(
		start = itemPaddingStart,
		top = itemPaddingVertical,

+1 −1

Original line number	Diff line number	Diff line
		@@ -103,7 +103,7 @@ private fun RowScope.ActionButton(actionButton: ActionButton) {
		if (isSpaExpressiveEnabled) {
		Column(horizontalAlignment = Alignment.CenterHorizontally) {
		IconButton(actionButton)
		Spacer(Modifier.height(SettingsDimension.paddingExtraSmall3))
		Spacer(Modifier.height(SettingsDimension.extraSmall3))
		Text(
		text = actionButton.text,
		modifier = Modifier.clearAndSetSemantics {}, // semantics set in IconButton

+1 −2

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ import androidx.compose.foundation.layout.size
		import androidx.compose.foundation.shape.CircleShape
		import androidx.compose.material.icons.Icons
		import androidx.compose.material.icons.filled.Close
		import androidx.compose.material.icons.filled.Stars
		import androidx.compose.material.icons.outlined.Stars
		import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
		import androidx.compose.material3.Icon
		@@ -80,7 +79,7 @@ fun SuggestionCard(model: SuggestionCardModel) {
		.clip(SettingsShape.CornerExtraLarge1)
		.background(MaterialTheme.colorScheme.secondaryContainer)
		.then(model.onClick?.let { Modifier.clickable(onClick = it) } ?: Modifier)
		.padding(SettingsDimension.paddingExtraSmall6),
		.padding(SettingsDimension.extraSmall6),
		) {
		SuggestionCardIcon(model.imageVector)
		Spacer(Modifier.padding(SettingsDimension.paddingSmall))

+1 −1

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@ internal fun BaseIcon(icon: @Composable (() -> Unit)?, modifier: Modifier, paddi
		) {
		icon()
		}
		Spacer(modifier = Modifier.width(width = SettingsDimension.paddingExtraSmall6))
		Spacer(modifier = Modifier.width(width = SettingsDimension.extraSmall6))
		}
		} else {
		if (icon != null) {

+2 −2

Original line number	Diff line number	Diff line
		@@ -43,13 +43,13 @@ fun BulletPreference(title: String, summary: String, icon: ImageVector) {
		Modifier
		.fillMaxWidth()
		.semantics(mergeDescendants = true) {}
		.padding(SettingsDimension.paddingSmall1),
		.padding(SettingsDimension.small1),
		) {
		Icon(
		imageVector = icon,
		contentDescription = null,
		modifier = Modifier
		.padding(end = SettingsDimension.paddingSmall1)
		.padding(end = SettingsDimension.small1)
		.size(SettingsDimension.itemIconSize),
		tint = MaterialTheme.colorScheme.onSurfaceVariant,
		)