Merge "[expressive design] Update text font." into main (53ab60ef) · Commits · e / os / android_frameworks_base

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/banner/SettingsBanner.kt

+4 −1

Original line number	Diff line number	Diff line
		@@ -57,6 +57,7 @@ import com.android.settingslib.spa.framework.theme.SettingsShape.CornerExtraLarg
		import com.android.settingslib.spa.framework.theme.SettingsShape.CornerExtraSmall
		import com.android.settingslib.spa.framework.theme.SettingsTheme
		import com.android.settingslib.spa.framework.theme.isSpaExpressiveEnabled
		import com.android.settingslib.spa.framework.theme.toSemiBoldWeight
		import com.android.settingslib.spa.widget.ui.SettingsBody
		import com.android.settingslib.spa.widget.ui.SettingsTitle

		@@ -159,7 +160,9 @@ fun BannerHeader(imageVector: ImageVector?, iconColor: Color, onDismiss: (() ->
		@Composable
		fun BannerTitleHeader(title: String, onDismiss: (() -> Unit)? = null) {
		Row(Modifier.fillMaxWidth()) {
		Box(modifier = Modifier.weight(1f)) { SettingsTitle(title) }
		Box(modifier = Modifier.weight(1f)) {
		Text(text = title, style = MaterialTheme.typography.titleMedium.toSemiBoldWeight())
		}
		Spacer(modifier = Modifier.padding(SettingsDimension.paddingSmall))
		DismissButton(onDismiss)
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ import com.android.settingslib.spa.framework.theme.SettingsShape
		import com.android.settingslib.spa.framework.theme.SettingsTheme
		import com.android.settingslib.spa.framework.theme.divider
		import com.android.settingslib.spa.framework.theme.isSpaExpressiveEnabled
		import com.android.settingslib.spa.framework.theme.toSemiBoldWeight

		data class ActionButton(
		val text: String,
		@@ -129,7 +130,7 @@ private fun RowScope.ActionButton(actionButton: ActionButton) {
		Text(
		text = actionButton.text,
		textAlign = TextAlign.Center,
		style = MaterialTheme.typography.labelMedium,
		style = MaterialTheme.typography.labelLarge.toSemiBoldWeight(),
		)
		}
		}

+11 −1

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import androidx.compose.foundation.rememberScrollState
		import androidx.compose.foundation.verticalScroll
		import androidx.compose.material3.AlertDialog
		import androidx.compose.material3.Button
		import androidx.compose.material3.MaterialTheme
		import androidx.compose.material3.OutlinedButton
		import androidx.compose.material3.Text
		import androidx.compose.material3.TextButton
		@@ -99,7 +100,16 @@ private fun AlertDialogPresenter.SettingsAlertDialog(
		dismissButton?.let {
		{ if (isSpaExpressiveEnabled) DismissButton(it) else Button(it) }
		},
		title = title?.let { { CenterRow { Text(it) } } },
		title =
		title?.let {
		{
		CenterRow {
		if (isSpaExpressiveEnabled)
		Text(it, style = MaterialTheme.typography.bodyLarge)
		else Text(it)
		}
		}
		},
		text =
		text?.let {
		{ CenterRow { Column(Modifier.verticalScroll(rememberScrollState())) { text() } } }

+3 −2

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
		import androidx.compose.ui.text.style.TextAlign
		import androidx.compose.ui.tooling.preview.Preview
		import com.android.settingslib.spa.framework.theme.SettingsDimension
		import com.android.settingslib.spa.framework.theme.toSemiBoldWeight

		@Composable
		fun IntroPreference(
		@@ -112,7 +113,7 @@ private fun IntroTitle(title: String) {
		Text(
		text = title,
		textAlign = TextAlign.Center,
		style = MaterialTheme.typography.titleLarge,
		style = MaterialTheme.typography.titleLarge.toSemiBoldWeight(),
		color = MaterialTheme.colorScheme.onSurface,
		)
		}
		@@ -126,7 +127,7 @@ private fun IntroDescription(descriptions: List<String>?) {
		Text(
		text = description,
		textAlign = TextAlign.Center,
		style = MaterialTheme.typography.titleMedium,
		style = MaterialTheme.typography.bodyLarge,
		color = MaterialTheme.colorScheme.onSurfaceVariant,
		modifier = Modifier.padding(top = SettingsDimension.paddingExtraSmall),
		)

+2 −1

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ import androidx.graphics.shapes.CornerRounding
		import androidx.graphics.shapes.RoundedPolygon
		import androidx.graphics.shapes.star
		import androidx.graphics.shapes.toPath
		import com.android.settingslib.spa.framework.theme.toSemiBoldWeight

		@Composable
		fun ZeroStatePreference(icon: ImageVector, text: String? = null, description: String? = null) {
		@@ -80,7 +81,7 @@ fun ZeroStatePreference(icon: ImageVector, text: String? = null, description: St
		Text(
		text = text,
		textAlign = TextAlign.Center,
		style = MaterialTheme.typography.titleMedium,
		style = MaterialTheme.typography.titleMedium.toSemiBoldWeight(),
		color = MaterialTheme.colorScheme.onSurfaceVariant,
		modifier = Modifier.padding(top = 24.dp),
		)