Merge "Use FlowRow for SettingsCard buttons" into main (dc07ca39) · Commits · e / os / android_frameworks_base

packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/card/CardPageProvider.kt

+2 −1

Original line number	Diff line number	Diff line
		@@ -112,7 +112,8 @@ object CardPageProvider : SettingsPageProvider {
		isVisible = { isVisible0 },
		onDismiss = { isVisible0 = false },
		buttons = listOf(
		CardButton(text = "Action") {},
		CardButton(text = "Override") {},
		CardButton(text = "Learn more") {},
		),
		),
		CardModel(

+4 −1

Original line number	Diff line number	Diff line
		@@ -21,6 +21,8 @@ import androidx.compose.foundation.clickable
		import androidx.compose.foundation.layout.Arrangement
		import androidx.compose.foundation.layout.Column
		import androidx.compose.foundation.layout.ColumnScope
		import androidx.compose.foundation.layout.ExperimentalLayoutApi
		import androidx.compose.foundation.layout.FlowRow
		import androidx.compose.foundation.layout.Row
		import androidx.compose.foundation.layout.Spacer
		import androidx.compose.foundation.layout.fillMaxWidth
		@@ -165,10 +167,11 @@ private fun DismissButton(onDismiss: (() -> Unit)?) {
		}
		}

		@OptIn(ExperimentalLayoutApi::class)
		@Composable
		private fun Buttons(buttons: List<CardButton>, color: Color) {
		if (buttons.isNotEmpty()) {
		Row(
		FlowRow(
		modifier = Modifier.fillMaxWidth(),
		horizontalArrangement = Arrangement.spacedBy(
		space = SettingsDimension.itemPaddingEnd,