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

Commit c630f69c authored by Alejandro Nijamkin's avatar Alejandro Nijamkin Committed by Ale Nijamkin
Browse files

[flexiglass] Makes PIN buttons not squished.

They were squished on foldables in vertical layout directions (folded
and unfolded).

Fix: 309524544
Test: see before and after screenshots in attached bug and updates Scuba
goldens.
Flag: ACONFIG com.android.systemui.scene_container DEVELOPMENT

Change-Id: Ief188ec3c9bb344bc2f140f1d8701827c0943cd6
parent f8e2f788
Loading
Loading
Loading
Loading
+20 −3
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
@@ -206,8 +207,7 @@ private fun Bouncer(

    Column(
        horizontalAlignment = Alignment.CenterHorizontally,
        verticalArrangement = Arrangement.spacedBy(60.dp),
        modifier = modifier.padding(start = 32.dp, top = 92.dp, end = 32.dp, bottom = 92.dp)
        modifier = modifier.padding(start = 32.dp, top = 92.dp, end = 32.dp, bottom = 0.dp)
    ) {
        Crossfade(
            targetState = message,
@@ -221,6 +221,8 @@ private fun Bouncer(
            )
        }

        Spacer(Modifier.heightIn(min = 21.dp, max = 48.dp))

        Box(Modifier.weight(1f)) {
            UserInputArea(
                viewModel = viewModel,
@@ -229,7 +231,22 @@ private fun Bouncer(
            )
        }

        actionButton?.let { BouncerActionButton(viewModel = it) }
        Spacer(Modifier.heightIn(min = 21.dp, max = 48.dp))

        val actionButtonModifier = Modifier.height(56.dp)

        actionButton.let { actionButtonViewModel ->
            if (actionButtonViewModel != null) {
                BouncerActionButton(
                    viewModel = actionButtonViewModel,
                    modifier = actionButtonModifier,
                )
            } else {
                Spacer(modifier = actionButtonModifier)
            }
        }

        Spacer(Modifier.height(48.dp))

        if (dialogMessage != null) {
            if (dialog == null) {
+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import androidx.compose.foundation.gestures.detectTapGestures
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.size
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
@@ -87,7 +87,7 @@ internal fun PinBouncer(
            }
    ) {
        PinInputDisplay(viewModel)
        Spacer(Modifier.height(100.dp))
        Spacer(Modifier.heightIn(min = 34.dp, max = 48.dp))
        PinPad(viewModel)
    }
}