Merge "[SPA] Fix icon misallign to ActionButton" into main (5e0c3966) · Commits · e / os / android_frameworks_base

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/button/ActionButtons.kt

+13 −2

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ import androidx.compose.foundation.layout.width
		import androidx.compose.material.icons.Icons
		import androidx.compose.material.icons.automirrored.outlined.Launch
		import androidx.compose.material.icons.outlined.Delete
		import androidx.compose.material.icons.outlined.DisabledByDefault
		import androidx.compose.material.icons.outlined.WarningAmber
		import androidx.compose.material3.ButtonDefaults
		import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
		@@ -102,13 +103,19 @@ fun ActionButtons(actionButtons: List<ActionButton>) {
		@Composable
		private fun RowScope.ActionButton(actionButton: ActionButton) {
		if (isSpaExpressiveEnabled) {
		Column(horizontalAlignment = Alignment.CenterHorizontally) {
		Column(
		horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier
		.weight(1f)
		) {
		IconButton(actionButton)
		Spacer(Modifier.height(SettingsSpace.extraSmall3))
		Text(
		text = actionButton.text,
		modifier = Modifier.clearAndSetSemantics {}, // semantics set in IconButton
		modifier = Modifier
		.clearAndSetSemantics {} // semantics set in IconButton
		.padding(horizontal = SettingsSpace.extraSmall4),
		style = MaterialTheme.typography.titleSmallEmphasized,
		textAlign = TextAlign.Center,
		)
		}
		} else {
		@@ -201,6 +208,10 @@ private fun ActionButtonsPreview() {
		ActionButton(text = "Open", imageVector = Icons.AutoMirrored.Outlined.Launch) {},
		ActionButton(text = "Uninstall", imageVector = Icons.Outlined.Delete) {},
		ActionButton(text = "Force stop", imageVector = Icons.Outlined.WarningAmber) {},
		ActionButton(
		text = "long long long long text",
		imageVector = Icons.Outlined.DisabledByDefault
		) {},
		)
		)
		}