Merge "[Expressive design] Adjust icon padding for SPA" into main (90dd45dd) · Commits · e / os / android_frameworks_base

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/preference/BaseLayout.kt

+20 −7

Original line number	Diff line number	Diff line
		@@ -87,6 +87,18 @@ internal fun BaseLayout(

		@Composable
		internal fun BaseIcon(icon: @Composable (() -> Unit)?, modifier: Modifier, paddingStart: Dp) {
		if (isSpaExpressiveEnabled) {
		Spacer(modifier = Modifier.width(width = paddingStart))
		if (icon != null) {
		Box(
		modifier = modifier.size(SettingsDimension.itemIconContainerSizeSmall),
		contentAlignment = Alignment.Center,
		) {
		icon()
		}
		Spacer(modifier = Modifier.width(width = SettingsDimension.paddingExtraSmall6))
		}
		} else {
		if (icon != null) {
		Box(
		modifier = modifier.size(SettingsDimension.itemIconContainerSize),
		@@ -98,6 +110,7 @@ internal fun BaseIcon(icon: @Composable (() -> Unit)?, modifier: Modifier, paddi
		Spacer(modifier = Modifier.width(width = paddingStart))
		}
		}
		}

		// Extracts a scope to avoid frequent recompose outside scope.
		@Composable