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

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

Merge "[flexiglass] Make the Bouncer bottom padding resize to available space." into main

parents 27ff2df4 00bd17d1
Loading
Loading
Loading
Loading
+11 −3
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ fun ContentScope.BouncerContent(

@Composable
@VisibleForTesting
fun ContentScope.BouncerContent(
fun BouncerContent(
    layout: BouncerOverlayLayout,
    viewModel: BouncerOverlayContentViewModel,
    dialogFactory: BouncerDialogFactory,
@@ -297,7 +297,7 @@ private fun StandardLayout(
        LocalWindowSizeClass.current.heightSizeClass == WindowHeightSizeClass.Expanded

    FoldAware(
        modifier = modifier.padding(top = 92.dp, bottom = 48.dp),
        modifier = modifier.padding(top = 92.dp, bottom = 32.dp),
        viewModel = viewModel,
        aboveFold = {
            Column(
@@ -326,7 +326,15 @@ private fun StandardLayout(
                    )
                }

                ActionArea(viewModel = viewModel, modifier = Modifier.padding(top = 48.dp))
                Column(
                    horizontalAlignment = Alignment.CenterHorizontally,
                    modifier = Modifier.fillMaxWidth(),
                ) {
                    ActionArea(viewModel = viewModel, modifier = Modifier.padding(top = 32.dp))
                    // This spacer dynamically resizes to 0 when there is insufficient space
                    // available, e.g. when the IME is shown.
                    Spacer(modifier = Modifier.weight(1f, fill = false).height(16.dp))
                }
            }
        },
    )