diff options
2 files changed, 7 insertions, 8 deletions
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContent.kt b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContent.kt index 1ce51afb4fdc..8c38253d6469 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContent.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContent.kt @@ -98,13 +98,7 @@ constructor( bottom = lockIconPlaceable[BlueprintAlignmentLines.LockIcon.Bottom], ) - val bottomAreaPlaceable = - bottomAreaMeasurable.measure( - noMinConstraints.copy( - maxHeight = - (constraints.maxHeight - lockIconBounds.bottom).coerceAtLeast(0) - ) - ) + val bottomAreaPlaceable = bottomAreaMeasurable.measure(noMinConstraints) val communalGridPlaceable = communalGridMeasurable.measure( diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/BottomAreaSection.kt b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/BottomAreaSection.kt index 86639fa02a92..b40bccb98597 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/BottomAreaSection.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/BottomAreaSection.kt @@ -98,7 +98,7 @@ constructor( ) { MovableElement( key = IndicationAreaElementKey, - modifier = modifier.shortcutPadding(), + modifier = modifier.indicationAreaPadding(), ) { content { IndicationArea( @@ -210,6 +210,11 @@ constructor( ) .padding(bottom = dimensionResource(R.dimen.keyguard_affordance_vertical_offset)) } + + @Composable + private fun Modifier.indicationAreaPadding(): Modifier { + return this.padding(bottom = dimensionResource(R.dimen.keyguard_indication_margin_bottom)) + } } private val StartButtonElementKey = ElementKey("StartButton") |