summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author SongFerng Wang <songferngwang@google.com> 2024-03-25 03:15:06 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-03-25 03:15:06 +0000
commitf901b91e0c5e89ae95ab288b3547e227c26954ac (patch)
tree7aa360642db467d9d836c14232c246f4126fa4e1
parent5cad74f6c37fc3266aa7cee92ea55f778c2d9abf (diff)
parent05d9c9a0aefdf80fd0be6d8f25524577f6531375 (diff)
Merge "Add the clickable for button at SuwScaffold" into main
-rw-r--r--packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/SuwScaffold.kt7
1 files changed, 4 insertions, 3 deletions
diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/SuwScaffold.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/SuwScaffold.kt
index 354b95ddcbfe..f372a45f9e59 100644
--- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/SuwScaffold.kt
+++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/SuwScaffold.kt
@@ -40,7 +40,8 @@ import com.android.settingslib.spa.framework.theme.toMediumWeight
data class BottomAppBarButton(
val text: String,
- val onClick: () -> Unit,
+ val enabled: Boolean = true,
+ val onClick: () -> Unit
)
@Composable
@@ -122,13 +123,13 @@ private fun BottomBar(
) {
Row(modifier = Modifier.padding(SettingsDimension.itemPaddingAround)) {
dismissButton?.apply {
- TextButton(onClick) {
+ TextButton(onClick = onClick, enabled = enabled) {
ActionText(text)
}
}
Spacer(modifier = Modifier.weight(1f))
actionButton?.apply {
- Button(onClick) {
+ Button(onClick = onClick, enabled = enabled) {
ActionText(text)
}
}