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

Commit 50312328 authored by tom hsu's avatar tom hsu
Browse files

[Expressive UI] Update SettingsBody's text color and style 

Flag: com.android.settingslib.widget.theme.flags.is_expressive_design_enabled
Fix: b/410475071
Test: Visual
Change-Id: Ic95333f403c612d4e934e03d283380f98dcaa979
parent 18e173c9

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/ui/Text.kt

+5 −2
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ import com.android.settingslib.spa.framework.theme.SettingsDimension 
import com.android.settingslib.spa.framework.theme.SettingsOpacity.alphaForEnabled

import com.android.settingslib.spa.framework.theme.SettingsOpacity.alphaForEnabled

import com.android.settingslib.spa.framework.theme.SettingsTheme

import com.android.settingslib.spa.framework.theme.SettingsTheme

import com.android.settingslib.spa.framework.theme.toMediumWeight

import com.android.settingslib.spa.framework.theme.toMediumWeight

import com.android.settingslib.spa.framework.theme.isSpaExpressiveEnabled





@Composable

@Composable

fun SettingsTitle(

fun SettingsTitle(
@@ -94,8 +95,10 @@ fun SettingsBody( 
        Text(

        Text(

            text = body,

            text = body,

            modifier = Modifier.contentDescription(contentDescription),

            modifier = Modifier.contentDescription(contentDescription),

            color = MaterialTheme.colorScheme.onSurfaceVariant,

            color = if (isSpaExpressiveEnabled) MaterialTheme.colorScheme.onSurface

            style = MaterialTheme.typography.bodyMedium,

            else MaterialTheme.colorScheme.onSurfaceVariant,

            style = if (isSpaExpressiveEnabled) MaterialTheme.typography.bodyLarge

            else MaterialTheme.typography.bodyMedium,

            overflow = TextOverflow.Ellipsis,

            overflow = TextOverflow.Ellipsis,

            maxLines = maxLines,

            maxLines = maxLines,

        )

        )