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

Commit f80029d6 authored by Tom Hsu's avatar Tom Hsu Committed by Android (Google) Code Review
Browse files

Merge "[Expressive UI] Update SettingsBody's text color and style" into main

parents 74fceb42 50312328

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

+5 −2
Original line number 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.SettingsTheme

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

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



@Composable

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

            text = body,

            modifier = Modifier.contentDescription(contentDescription),

            color = MaterialTheme.colorScheme.onSurfaceVariant,

            style = MaterialTheme.typography.bodyMedium,

            color = if (isSpaExpressiveEnabled) MaterialTheme.colorScheme.onSurface

            else MaterialTheme.colorScheme.onSurfaceVariant,

            style = if (isSpaExpressiveEnabled) MaterialTheme.typography.bodyLarge

            else MaterialTheme.typography.bodyMedium,

            overflow = TextOverflow.Ellipsis,

            maxLines = maxLines,

        )