From 05d9c9a0aefdf80fd0be6d8f25524577f6531375 Mon Sep 17 00:00:00 2001 From: songferngwang Date: Thu, 21 Mar 2024 09:48:11 +0000 Subject: Add the clickable for button at SuwScaffold Bug: 329535069 Test: manual test. To verify the UI atest SuwScaffoldTest Change-Id: I79f5687df25a508e7ecceb66dd4bf4105ae3817b --- .../src/com/android/settingslib/spa/widget/scaffold/SuwScaffold.kt | 7 ++++--- 1 file 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) } } -- cgit v1.2.3-59-g8ed1b