Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95ff0202 authored by Chaohui Wang's avatar Chaohui Wang
Browse files

[Expressive design] Adjust icon padding for SPA 

To align with spec.

Bug: 366336385
Flag: com.android.settingslib.widget.theme.flags.is_expressive_design_enabled
Test: visual
Change-Id: Ia128e12d907b9dcab9f6e99b75faed005ba8692a
parent 2776ba79

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