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

Commit 161a6bb4 authored by Alexander Hendrich's avatar Alexander Hendrich
Browse files

Fix color application to back button on bouncer 

Same as with http://ag/34810040, the text color should actually be
applied to the outer button element and not the inner text element.
This allows for the button to have the proper colors when it is
disabled (it's currently always enabled though).

Bug: 418724618
Flag: com.android.systemui.scene_container
Test: atest BouncerOverlayContentViewModelTest
Test: atest BouncerContentComposeTest
Change-Id: Ib9d61044e753aa896f838e13015c8baf2f77a3fe
parent 2dd142be

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

+4 −1
Original line number Diff line number Diff line
@@ -273,11 +273,14 @@ fun BouncerContent( 
                border =

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

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

                colors =

                    ButtonDefaults.outlinedButtonColors(

                        contentColor = MaterialTheme.colorScheme.primary

                    ),

            ) {

                Text(

                    text = stringResource(R.string.back_button_on_bouncer),

                    style = MaterialTheme.typography.titleMedium,

                    color = MaterialTheme.colorScheme.primary,

                )

            }

        }