Merge "[Spa] Polish Footer specs" into main (702ba14c) · Commits · e / os / android_frameworks_base

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

+6 −10

Original line number	Diff line number	Diff line
		@@ -24,10 +24,6 @@ object SettingsDimension {
		val paddingSmall = if (isSpaExpressiveEnabled) 8.dp else 4.dp
		val paddingLarge = 16.dp
		val paddingExtraLarge = 24.dp
		val paddingExtraLarge1 = 28.dp

		val actionIconSize = 40.dp
		val actionIconPadding = 8.dp

		val itemIconSize = 24.dp
		val itemIconContainerSizeSmall = 40.dp
		@@ -42,12 +38,12 @@ object SettingsDimension {
		end = itemPaddingEnd,
		bottom = itemPaddingVertical,
		)
		val footerItemPadding = PaddingValues(
		start = paddingExtraLarge1,
		top = itemPaddingVertical,
		end = itemPaddingEnd,
		bottom = itemPaddingVertical,
		)
		val footerPadding =
		if (isSpaExpressiveEnabled) {
		PaddingValues(horizontal = SettingsSpace.small4, vertical = SettingsSpace.small1)
		} else {
		itemPadding
		}
		val textFieldPadding = PaddingValues(
		start = itemPaddingStart,
		end = itemPaddingEnd,

+10 −2

Original line number	Diff line number	Diff line
		@@ -29,7 +29,9 @@ import androidx.compose.runtime.Composable
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.tooling.preview.Preview
		import com.android.settingslib.spa.framework.theme.SettingsDimension
		import com.android.settingslib.spa.framework.theme.SettingsSpace
		import com.android.settingslib.spa.framework.theme.SettingsTheme
		import com.android.settingslib.spa.framework.theme.isSpaExpressiveEnabled

		@Composable
		fun Footer(footerText: String) {
		@@ -41,14 +43,20 @@ fun Footer(footerText: String) {

		@Composable
		fun Footer(content: @Composable () -> Unit) {
		Column(Modifier.padding(SettingsDimension.itemPadding)) {
		Column(Modifier.padding(SettingsDimension.footerPadding)) {
		Icon(
		imageVector = Icons.Outlined.Info,
		contentDescription = null,
		modifier = Modifier.size(SettingsDimension.itemIconSize),
		tint = MaterialTheme.colorScheme.onSurfaceVariant,
		)
		Spacer(modifier = Modifier.height(SettingsDimension.itemPaddingVertical))
		val spaceHeight =
		if (isSpaExpressiveEnabled) {
		SettingsSpace.extraSmall4
		} else {
		SettingsDimension.paddingLarge
		}
		Spacer(modifier = Modifier.height(spaceHeight))
		content()
		}
		}

+1 −5

Original line number	Diff line number	Diff line
		@@ -134,11 +134,7 @@ class AppInfoProvider(private val packageInfo: PackageInfo) {
		}
		if (footer.isBlank()) return
		if (!isSpaExpressiveEnabled) HorizontalDivider()
		Column(
		modifier =
		if (isSpaExpressiveEnabled) Modifier.padding(SettingsDimension.footerItemPadding)
		else Modifier.padding(SettingsDimension.itemPadding)
		) {
		Box(modifier = Modifier.padding(SettingsDimension.footerPadding)) {
		CopyableBody(footer)
		}
		}