From 6d6d995c4df8db200c456dd0cff0976560f4e9b2 Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Sun, 9 Apr 2023 21:27:03 +0800 Subject: [PATCH] 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 --- .../settingslib/spa/widget/scaffold/CustomizedAppBar.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/CustomizedAppBar.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/CustomizedAppBar.kt index 47ac2df67c765..e07a6298a627b 100644 --- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/CustomizedAppBar.kt +++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/CustomizedAppBar.kt @@ -69,6 +69,7 @@ import androidx.compose.ui.semantics.clearAndSetSemantics import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.Constraints +import androidx.compose.ui.unit.Density import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.Velocity import androidx.compose.ui.unit.dp @@ -460,6 +461,9 @@ private fun TopAppBarLayout( ProvideTextStyle(value = titleTextStyle) { CompositionLocalProvider( 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 ) }