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

Commit 400605a1 authored by Chaohui Wang's avatar Chaohui Wang Committed by Automerger Merge Worker
Browse files

Merge "Disable the App Bar title font scaling" into udc-dev am: 7dd18dd3 

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



Change-Id: I2f2427faf75736158bfa687c53bc0f3113c5ca94
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3d65df87 7dd18dd3

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

+4 −0
Original line number 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.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

                    )

                }