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

Commit 44338835 authored by Josh's avatar Josh
Browse files

Updated typography to use GM3 title small. 

Test: Manual - ensure typography corresponds to mocks.
Flag: com.android.systemui.keyboard_shortcut_helper_rewrite
Fix: 359846308
Change-Id: I61248e2a1b012197a950c27dd5073ac997602991
parent 923f969d

packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/composable/ShortcutHelper.kt

+5 −3
Original line number Diff line number Diff line
@@ -761,7 +761,7 @@ private fun ShortcutDescriptionText( 
    Text(

        modifier = modifier,

        text = textWithHighlightedSearchQuery(shortcut.label, searchQuery),

        style = MaterialTheme.typography.bodyMedium,

        style = MaterialTheme.typography.titleSmall,

        color = MaterialTheme.colorScheme.onSurface,

    )

}
@@ -879,7 +879,7 @@ private fun CategoryItemTwoPane( 
                Text(

                    fontSize = 18.sp,

                    color = colors.textColor(selected).value,

                    style = MaterialTheme.typography.headlineSmall,

                    style = MaterialTheme.typography.titleSmall,

                    text = label,

                )

            }
@@ -975,9 +975,11 @@ private fun KeyboardSettings(horizontalPadding: Dp, verticalPadding: Dp, onClick 
    ) {

        Row(verticalAlignment = Alignment.CenterVertically) {

            Text(

                text =

                    stringResource(id = R.string.shortcut_helper_keyboard_settings_buttons_label),

                color = MaterialTheme.colorScheme.onSurfaceVariant,

                fontSize = 16.sp,

                style = MaterialTheme.typography.titleSmall,

            )

            Spacer(modifier = Modifier.weight(1f))

            Icon(