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

Commit d94d781b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Enable Hyphens.Auto for SPA" into udc-dev am: 97d648ce am: 4453e4ec 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23381749



Change-Id: I5d50fe0c592dece2c3c56b49b89cadf22c11e476
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 185ebc3a 4453e4ec

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/theme/SettingsTypography.kt

+22 −6
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import androidx.compose.runtime.Composable 
import androidx.compose.runtime.remember

import androidx.compose.ui.text.TextStyle

import androidx.compose.ui.text.font.FontWeight

import androidx.compose.ui.text.style.Hyphens

import androidx.compose.ui.unit.em

import androidx.compose.ui.unit.sp
@@ -34,42 +35,48 @@ private class SettingsTypography(settingsFontFamily: SettingsFontFamily) { 
            fontWeight = FontWeight.Normal,

            fontSize = 57.sp,

            lineHeight = 64.sp,

            letterSpacing = (-0.2).sp

            letterSpacing = (-0.2).sp,

            hyphens = Hyphens.Auto,

        ),

        displayMedium = TextStyle(

            fontFamily = brand,

            fontWeight = FontWeight.Normal,

            fontSize = 45.sp,

            lineHeight = 52.sp,

            letterSpacing = 0.0.sp

            letterSpacing = 0.0.sp,

            hyphens = Hyphens.Auto,

        ),

        displaySmall = TextStyle(

            fontFamily = brand,

            fontWeight = FontWeight.Normal,

            fontSize = 36.sp,

            lineHeight = 44.sp,

            letterSpacing = 0.0.sp

            letterSpacing = 0.0.sp,

            hyphens = Hyphens.Auto,

        ),

        headlineLarge = TextStyle(

            fontFamily = brand,

            fontWeight = FontWeight.Normal,

            fontSize = 32.sp,

            lineHeight = 40.sp,

            letterSpacing = 0.0.sp

            letterSpacing = 0.0.sp,

            hyphens = Hyphens.Auto,

        ),

        headlineMedium = TextStyle(

            fontFamily = brand,

            fontWeight = FontWeight.Normal,

            fontSize = 28.sp,

            lineHeight = 36.sp,

            letterSpacing = 0.0.sp

            letterSpacing = 0.0.sp,

            hyphens = Hyphens.Auto,

        ),

        headlineSmall = TextStyle(

            fontFamily = brand,

            fontWeight = FontWeight.Normal,

            fontSize = 24.sp,

            lineHeight = 32.sp,

            letterSpacing = 0.0.sp

            letterSpacing = 0.0.sp,

            hyphens = Hyphens.Auto,

        ),

        titleLarge = TextStyle(

            fontFamily = brand,
@@ -77,6 +84,7 @@ private class SettingsTypography(settingsFontFamily: SettingsFontFamily) { 
            fontSize = 22.sp,

            lineHeight = 28.sp,

            letterSpacing = 0.02.em,

            hyphens = Hyphens.Auto,

        ),

        titleMedium = TextStyle(

            fontFamily = brand,
@@ -84,6 +92,7 @@ private class SettingsTypography(settingsFontFamily: SettingsFontFamily) { 
            fontSize = 20.sp,

            lineHeight = 24.sp,

            letterSpacing = 0.02.em,

            hyphens = Hyphens.Auto,

        ),

        titleSmall = TextStyle(

            fontFamily = brand,
@@ -91,6 +100,7 @@ private class SettingsTypography(settingsFontFamily: SettingsFontFamily) { 
            fontSize = 18.sp,

            lineHeight = 20.sp,

            letterSpacing = 0.02.em,

            hyphens = Hyphens.Auto,

        ),

        bodyLarge = TextStyle(

            fontFamily = plain,
@@ -98,6 +108,7 @@ private class SettingsTypography(settingsFontFamily: SettingsFontFamily) { 
            fontSize = 16.sp,

            lineHeight = 24.sp,

            letterSpacing = 0.01.em,

            hyphens = Hyphens.Auto,

        ),

        bodyMedium = TextStyle(

            fontFamily = plain,
@@ -105,6 +116,7 @@ private class SettingsTypography(settingsFontFamily: SettingsFontFamily) { 
            fontSize = 14.sp,

            lineHeight = 20.sp,

            letterSpacing = 0.01.em,

            hyphens = Hyphens.Auto,

        ),

        bodySmall = TextStyle(

            fontFamily = plain,
@@ -112,6 +124,7 @@ private class SettingsTypography(settingsFontFamily: SettingsFontFamily) { 
            fontSize = 12.sp,

            lineHeight = 16.sp,

            letterSpacing = 0.01.em,

            hyphens = Hyphens.Auto,

        ),

        labelLarge = TextStyle(

            fontFamily = plain,
@@ -119,6 +132,7 @@ private class SettingsTypography(settingsFontFamily: SettingsFontFamily) { 
            fontSize = 16.sp,

            lineHeight = 24.sp,

            letterSpacing = 0.01.em,

            hyphens = Hyphens.Auto,

        ),

        labelMedium = TextStyle(

            fontFamily = plain,
@@ -126,6 +140,7 @@ private class SettingsTypography(settingsFontFamily: SettingsFontFamily) { 
            fontSize = 14.sp,

            lineHeight = 20.sp,

            letterSpacing = 0.01.em,

            hyphens = Hyphens.Auto,

        ),

        labelSmall = TextStyle(

            fontFamily = plain,
@@ -133,6 +148,7 @@ private class SettingsTypography(settingsFontFamily: SettingsFontFamily) { 
            fontSize = 12.sp,

            lineHeight = 16.sp,

            letterSpacing = 0.01.em,

            hyphens = Hyphens.Auto,

        ),

    )

}