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

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

Merge "[flexiglass] Update styling for back button on bouncer" into main

parents 7c9f31af 8425887b

packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/BouncerContent.kt

+12 −13
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import androidx.compose.animation.core.animateDpAsState 
import androidx.compose.animation.core.animateFloatAsState

import androidx.compose.animation.core.snap

import androidx.compose.animation.core.tween

import androidx.compose.foundation.BorderStroke

import androidx.compose.foundation.Image

import androidx.compose.foundation.background

import androidx.compose.foundation.combinedClickable
@@ -36,6 +37,7 @@ import androidx.compose.foundation.layout.Arrangement 
import androidx.compose.foundation.layout.Box

import androidx.compose.foundation.layout.BoxScope

import androidx.compose.foundation.layout.Column

import androidx.compose.foundation.layout.PaddingValues

import androidx.compose.foundation.layout.Row

import androidx.compose.foundation.layout.Spacer

import androidx.compose.foundation.layout.fillMaxHeight
@@ -48,7 +50,6 @@ import androidx.compose.foundation.layout.size 
import androidx.compose.foundation.layout.width

import androidx.compose.foundation.shape.RoundedCornerShape

import androidx.compose.material.icons.Icons

import androidx.compose.material.icons.automirrored.filled.ArrowBack

import androidx.compose.material.icons.filled.KeyboardArrowDown

import androidx.compose.material3.ButtonDefaults

import androidx.compose.material3.DropdownMenu
@@ -56,8 +57,8 @@ import androidx.compose.material3.DropdownMenuItem 
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi

import androidx.compose.material3.Icon

import androidx.compose.material3.MaterialTheme

import androidx.compose.material3.OutlinedButton

import androidx.compose.material3.Text

import androidx.compose.material3.TextButton

import androidx.compose.material3.windowsizeclass.WindowHeightSizeClass

import androidx.compose.runtime.Composable

import androidx.compose.runtime.DisposableEffect
@@ -91,7 +92,6 @@ import androidx.compose.ui.unit.DpOffset 
import androidx.compose.ui.unit.IntOffset

import androidx.compose.ui.unit.LayoutDirection

import androidx.compose.ui.unit.dp

import androidx.compose.ui.unit.sp

import androidx.compose.ui.unit.times

import androidx.lifecycle.compose.collectAsStateWithLifecycle

import com.android.compose.PlatformButton
@@ -258,20 +258,19 @@ fun ContentScope.BouncerContent( 
        Dialog(bouncerViewModel = viewModel, dialogFactory = dialogFactory)



        if (viewModel.showBackButton) {

            TextButton(

            OutlinedButton(

                onClick = viewModel::navigateBack,

                modifier =

                    Modifier.align(Alignment.BottomStart)

                        .padding(horizontal = 48.dp, vertical = 40.dp)

                        .testTag("BackButton"),

                    Modifier.align(Alignment.BottomStart).padding(24.dp).testTag("BackButton"),

                border =

                    BorderStroke(width = 1.dp, color = MaterialTheme.colorScheme.outlineVariant),

                contentPadding = PaddingValues(horizontal = 24.dp, vertical = 16.dp),

            ) {

                Icon(

                    Icons.AutoMirrored.Filled.ArrowBack,

                    null,

                    tint = MaterialTheme.colorScheme.primary,

                Text(

                    text = stringResource(R.string.back_button_on_bouncer),

                    style = MaterialTheme.typography.titleMedium,

                    color = MaterialTheme.colorScheme.primary,

                )

                Spacer(Modifier.size(ButtonDefaults.IconSpacing))

                Text(text = stringResource(R.string.back_button_on_bouncer), fontSize = 14.sp)

            }

        }

    }