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

Commit 922a21f3 authored by Ale Nijamkin's avatar Ale Nijamkin Committed by Android (Google) Code Review
Browse files

Merge "PlatformButton: expose contentPadding and shape" into main

parents 2afd4e3a d194d8d9

packages/SystemUI/compose/core/src/com/android/compose/PlatformButtons.kt

+5 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import androidx.compose.material3.IconButtonDefaults 
import androidx.compose.material3.MaterialTheme

import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

import androidx.compose.ui.graphics.Shape

import androidx.compose.ui.res.painterResource

import androidx.compose.ui.unit.dp
@@ -40,12 +41,15 @@ fun PlatformButton( 
    modifier: Modifier = Modifier,

    enabled: Boolean = true,

    colors: ButtonColors = filledButtonColors(),

    contentPadding: PaddingValues = ButtonPaddings,

    shape: Shape = ButtonDefaults.shape,

    content: @Composable RowScope.() -> Unit,

) {

    androidx.compose.material3.Button(

        modifier = modifier.heightIn(min = 36.dp),

        colors = colors,

        contentPadding = ButtonPaddings,

        contentPadding = contentPadding,

        shape = shape,

        onClick = onClick,

        enabled = enabled,

    ) {