Merge "Polish the padding of SuwScaffold" into main (a2265465) · Commits · e / os / android_frameworks_base

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/theme/SettingsDimension.kt

+6 −4

Original line number	Diff line number	Diff line
		@@ -22,12 +22,14 @@ import androidx.compose.ui.unit.dp
		object SettingsDimension {
		val paddingTiny = 2.dp
		val paddingSmall = 4.dp
		val paddingLarge = 16.dp
		val paddingExtraLarge = 24.dp

		val itemIconSize = 24.dp
		val itemIconContainerSize = 72.dp
		val itemPaddingStart = 24.dp
		val itemPaddingEnd = 16.dp
		val itemPaddingVertical = 16.dp
		val itemPaddingStart = paddingExtraLarge
		val itemPaddingEnd = paddingLarge
		val itemPaddingVertical = paddingLarge
		val itemPadding = PaddingValues(
		start = itemPaddingStart,
		top = itemPaddingVertical,
		@@ -70,6 +72,6 @@ object SettingsDimension {
		/** The sizes info of illustration widget. */
		val illustrationMaxWidth = 412.dp
		val illustrationMaxHeight = 300.dp
		val illustrationPadding = 16.dp
		val illustrationPadding = paddingLarge
		val illustrationCornerRadius = 28.dp
		}

+15 −2

Original line number	Diff line number	Diff line
		@@ -101,7 +101,13 @@ private fun Header(
		imageVector: ImageVector,
		title: String
		) {
		Column(Modifier.padding(SettingsDimension.itemPadding)) {
		Column(
		Modifier.padding(
		start = SettingsDimension.itemPaddingStart,
		top = SettingsDimension.itemPaddingVertical,
		end = SettingsDimension.itemPaddingEnd,
		)
		) {
		Icon(
		imageVector = imageVector,
		contentDescription = null,
		@@ -124,7 +130,14 @@ private fun BottomBar(
		actionButton: BottomAppBarButton?,
		dismissButton: BottomAppBarButton?,
		) {
		Row(modifier = Modifier.padding(SettingsDimension.itemPaddingAround)) {
		Row(
		Modifier.padding(
		start = SettingsDimension.itemPaddingEnd,
		top = SettingsDimension.paddingExtraLarge,
		end = SettingsDimension.itemPaddingEnd,
		bottom = SettingsDimension.itemPaddingVertical,
		)
		) {
		dismissButton?.apply {
		TextButton(onClick = onClick, enabled = enabled) {
		ActionText(text)