Merge "[Expressive design] Update SPA TwoTargetPreference" into main (2013428e) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@ object SettingsDimension {
		bottom = itemPaddingVertical,
		)
		val itemPaddingAround = 8.dp
		val itemDividerHeight = 32.dp
		val itemDividerHeight = if (isSpaExpressiveEnabled) 40.dp else 32.dp

		val iconLarge = 48.dp
		val introIconSize = 40.dp

+12 −5

Original line number	Diff line number	Diff line
		@@ -28,8 +28,6 @@ import androidx.compose.material.icons.filled.ChevronRight
		import androidx.compose.material3.Icon
		import androidx.compose.material3.MaterialTheme
		import androidx.compose.runtime.Composable
		import androidx.compose.runtime.getValue
		import androidx.compose.runtime.setValue
		import androidx.compose.ui.Alignment
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.unit.dp
		@@ -104,8 +102,17 @@ internal fun TwoTargetPreference(
		@Composable
		private fun PreferenceDivider() {
		Box(
		if (isSpaExpressiveEnabled) {
		Modifier.padding(
		start = SettingsDimension.paddingSmall,
		end = SettingsDimension.paddingExtraSmall6,
		)
		.size(width = 1.dp, height = SettingsDimension.itemDividerHeight)
		.background(color = MaterialTheme.colorScheme.outline)
		} else {
		Modifier.padding(horizontal = SettingsDimension.itemPaddingEnd)
		.size(width = 1.dp, height = SettingsDimension.itemDividerHeight)
		.background(color = MaterialTheme.colorScheme.divider)
		}
		)
		}