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

Commit 745ed44e authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix ActionButtons alignment" into udc-dev

parents d8f701b9 9e2643df

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/button/ActionButtons.kt

+11 −6
Original line number Original line Diff line number Diff line
@@ -24,7 +24,6 @@ import androidx.compose.foundation.layout.IntrinsicSize 
import androidx.compose.foundation.layout.PaddingValues

import androidx.compose.foundation.layout.PaddingValues

import androidx.compose.foundation.layout.Row

import androidx.compose.foundation.layout.Row

import androidx.compose.foundation.layout.RowScope

import androidx.compose.foundation.layout.RowScope

import androidx.compose.foundation.layout.Spacer

import androidx.compose.foundation.layout.fillMaxHeight

import androidx.compose.foundation.layout.fillMaxHeight

import androidx.compose.foundation.layout.height

import androidx.compose.foundation.layout.height

import androidx.compose.foundation.layout.padding

import androidx.compose.foundation.layout.padding
@@ -46,6 +45,7 @@ import androidx.compose.ui.Modifier 
import androidx.compose.ui.draw.clip

import androidx.compose.ui.draw.clip

import androidx.compose.ui.graphics.RectangleShape

import androidx.compose.ui.graphics.RectangleShape

import androidx.compose.ui.graphics.vector.ImageVector

import androidx.compose.ui.graphics.vector.ImageVector

import androidx.compose.ui.text.style.TextAlign

import androidx.compose.ui.tooling.preview.Preview

import androidx.compose.ui.tooling.preview.Preview

import androidx.compose.ui.unit.dp

import androidx.compose.ui.unit.dp

import com.android.settingslib.spa.framework.theme.SettingsDimension

import com.android.settingslib.spa.framework.theme.SettingsDimension
@@ -100,14 +100,19 @@ private fun RowScope.ActionButton(actionButton: ActionButton) { 
                contentDescription = null,

                contentDescription = null,

                modifier = Modifier.size(SettingsDimension.itemIconSize),

                modifier = Modifier.size(SettingsDimension.itemIconSize),

            )

            )

            Spacer(Modifier.height(4.dp))

            Box(

                modifier = Modifier.padding(top = 4.dp).fillMaxHeight(),

                contentAlignment = Alignment.Center,

            ) {

                Text(

                Text(

                    text = actionButton.text,

                    text = actionButton.text,

                    textAlign = TextAlign.Center,

                    style = MaterialTheme.typography.labelMedium,

                    style = MaterialTheme.typography.labelMedium,

                )

                )

            }

            }

        }

        }

    }

    }

}





@Composable

@Composable

private fun ButtonDivider() {

private fun ButtonDivider() {