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

Commit fbc46287 authored by William Xiao's avatar William Xiao
Browse files

Fix keyguard indication text on hub getting cut off with larger display/text sizes 

The view-based keyguard indication text is placed via constraints to a
fixed distance from the bottom of the screen and is allowed to expand
as much as it wants. The compose-based one brings its own padding but
has its height limited to fit under the lock icon. Since the lock icon
UI element is much larger than the icon image itself, this leads to the
indication text being cut off.

This CL uses the correct bottom padding for the compose-based
indication area and removes its heigh restriction.

See bug for hierarchy snapshots.

Bug: 349510838
Fix: 349510838
Test: verified locally on device
Flag: com.android.systemui.communal_hub
Change-Id: I36a061c9dc585234ac62565ab63238106c4d2d54
parent 7fe4dd3f

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(

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/BottomAreaSection.kt

+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")