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

Commit a6556160 authored by Yuchen Sun's avatar Yuchen Sun Committed by Android (Google) Code Review
Browse files

Merge "[expressive design] Fix colors." into main

parents 77793b2c 414d0239

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

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ private fun IntroIcon(imageVector: ImageVector?) { 
                imageVector = imageVector,

                contentDescription = null,

                modifier = Modifier.size(SettingsDimension.introIconSize),

                tint = MaterialTheme.colorScheme.onSecondary,

                tint = MaterialTheme.colorScheme.onSecondaryContainer,

            )

        }

    }

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

+8 −1
Original line number Diff line number Diff line
@@ -49,7 +49,14 @@ internal fun TwoTargetPreference( 
    widget: @Composable () -> Unit,

) {

    Row(

        modifier = Modifier.fillMaxWidth().padding(end = SettingsDimension.itemPaddingEnd),

        modifier =

            Modifier.fillMaxWidth()

                .then(

                    if (isSpaExpressiveEnabled)

                        Modifier.background(MaterialTheme.colorScheme.surfaceBright)

                    else Modifier

                )

                .padding(end = SettingsDimension.itemPaddingEnd),

        verticalAlignment = Alignment.CenterVertically,

    ) {

        if (isSpaExpressiveEnabled) {