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

Commit 830010da authored by Charlotte Lu's avatar Charlotte Lu Committed by Android (Google) Code Review
Browse files

Merge "Edit APN padding" into main

parents 91129923 03f252c7

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/theme/SettingsDimension.kt

+9 −0
Original line number Diff line number Diff line
@@ -34,6 +34,15 @@ object SettingsDimension { 
        end = itemPaddingEnd,

        bottom = itemPaddingVertical,

    )

    val textFieldPadding = PaddingValues(

        start = itemPaddingStart,

        end = itemPaddingEnd,

    )

    val menuFieldPadding = PaddingValues(

        start = itemPaddingStart,

        end = itemPaddingEnd,

        bottom = itemPaddingVertical,

    )

    val itemPaddingAround = 8.dp

    val itemDividerHeight = 32.dp

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/editor/SettingsExposedDropdownMenuBox.kt

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ fun SettingsExposedDropdownMenuBox( 
        onExpandedChange = { expanded = it },

        modifier = Modifier

            .width(350.dp)

            .padding(SettingsDimension.itemPadding),

            .padding(SettingsDimension.menuFieldPadding),

    ) {

        OutlinedTextField(

            // The `menuAnchor` modifier must be passed to the text field for correctness.

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/editor/SettingsExposedDropdownMenuCheckBox.kt

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ fun SettingsExposedDropdownMenuCheckBox( 
        onExpandedChange = { expanded = it },

        modifier = Modifier

            .width(350.dp)

            .padding(SettingsDimension.itemPadding)

            .padding(SettingsDimension.menuFieldPadding)

            .onSizeChanged { dropDownWidth = it.width },

    ) {

        OutlinedTextField(

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/editor/SettingsOutlinedTextField.kt

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ fun SettingsOutlinedTextField( 
    OutlinedTextField(

        modifier = Modifier

            .fillMaxWidth()

            .padding(SettingsDimension.itemPadding),

            .padding(SettingsDimension.textFieldPadding),

        value = value,

        onValueChange = onTextChange,

        label = {

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/editor/SettingsTextFieldPassword.kt

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ fun SettingsTextFieldPassword( 
    var visibility by remember { mutableStateOf(false) }

    OutlinedTextField(

        modifier = Modifier

            .padding(SettingsDimension.itemPadding)

            .padding(SettingsDimension.menuFieldPadding)

            .fillMaxWidth(),

        value = value,

        onValueChange = onTextChange,