Merge "Fix keyguard indication text on hub getting cut off with larger... (7814e418) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContent.kt

+1 −7

Original line number	Diff line number	Diff line
		@@ -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(

+6 −1

Original line number	Diff line number	Diff line
		@@ -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")