Merge "[Expressive UI] Combine the icon and text for ActionButton" into main (c582e387) · Commits · e / os / android_frameworks_base

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

+30 −30

Original line number	Diff line number	Diff line
		@@ -96,7 +96,6 @@ fun ActionButtons(actionButtons: List<ActionButton>) {
		@Composable
		private fun RowScope.ActionButton(actionButton: ActionButton) {
		if (isSpaExpressiveEnabled) {
		Column(horizontalAlignment = Alignment.CenterHorizontally) {
		FilledTonalButton(
		onClick = actionButton.onClick,
		modifier = Modifier
		@@ -115,12 +114,12 @@ private fun RowScope.ActionButton(actionButton: ActionButton) {
		),
		contentPadding = PaddingValues(horizontal = 24.dp, vertical = 16.dp),
		) {
		Column(horizontalAlignment = Alignment.CenterHorizontally) {
		Icon(
		imageVector = actionButton.imageVector,
		contentDescription = null,
		modifier = Modifier.size(SettingsDimension.itemIconSize),
		)
		}
		Box(
		modifier = Modifier
		.padding(top = 6.dp),
		@@ -133,6 +132,7 @@ private fun RowScope.ActionButton(actionButton: ActionButton) {
		)
		}
		}
		}
		} else {
		FilledTonalButton(
		onClick = actionButton.onClick,