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

Commit 32a5eb4e authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Expressive UI] Fix different hight of title" into main

parents 5f61d7f8 4ea2efb4

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

+2 −2
Original line number Diff line number Diff line
@@ -676,10 +676,10 @@ private suspend fun settleAppBar( 
// Medium or Large app bar.

private val TopTitleAlphaEasing = CubicBezierEasing(.8f, 0f, .8f, .15f)



internal val MaxHeightWithoutTitle = if (isSpaExpressiveEnabled) 84.dp else 124.dp

internal val MaxHeightWithoutTitle = 124.dp

internal val DefaultTitleHeight = 52.dp

internal val ContainerHeight = 56.dp

private val titleBaselineHeight = if (isSpaExpressiveEnabled) 8.dp else 0.dp

private val titleBaselineHeight = 0.dp

private val LargeTitleBottomPadding = 28.dp

private val TopAppBarHorizontalPadding = 4.dp