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

Commit 6d6d995c authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Disable the App Bar title font scaling 

To align with UI before SPA migration.

Fix: 276057131
Test: Manually with App languages when font scale is set
Change-Id: If5a21754f5ba3676e297492bf83d3f3b23fa2f71
parent 45e2e3cd

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/CustomizedAppBar.kt

+4 −0
Original line number Original line Diff line number Diff line
@@ -69,6 +69,7 @@ import androidx.compose.ui.semantics.clearAndSetSemantics 
import androidx.compose.ui.text.TextStyle

import androidx.compose.ui.text.TextStyle

import androidx.compose.ui.text.style.TextOverflow

import androidx.compose.ui.text.style.TextOverflow

import androidx.compose.ui.unit.Constraints

import androidx.compose.ui.unit.Constraints

import androidx.compose.ui.unit.Density

import androidx.compose.ui.unit.Dp

import androidx.compose.ui.unit.Dp

import androidx.compose.ui.unit.Velocity

import androidx.compose.ui.unit.Velocity

import androidx.compose.ui.unit.dp

import androidx.compose.ui.unit.dp
@@ -460,6 +461,9 @@ private fun TopAppBarLayout( 
                ProvideTextStyle(value = titleTextStyle) {

                ProvideTextStyle(value = titleTextStyle) {

                    CompositionLocalProvider(

                    CompositionLocalProvider(

                        LocalContentColor provides titleContentColor,

                        LocalContentColor provides titleContentColor,

                        // Disable the title font scaling by only passing the density but not the

                        // font scale.

                        LocalDensity provides Density(density = LocalDensity.current.density),

                        content = title

                        content = title

                    )

                    )

                }

                }