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

Commit e05df885 authored by Chaohui Wang's avatar Chaohui Wang Committed by Automerger Merge Worker
Browse files

Merge "Add vertical padding between Spinner texts" into udc-dev am: 0f8650e5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22779457



Change-Id: Ibc98f15c099bf6d4ae4ba7a35419c7904740c9b2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 48857bdb 0f8650e5

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/ui/Spinner.kt

+9 −6
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.settingslib.spa.widget.ui 
import androidx.compose.foundation.background

import androidx.compose.foundation.layout.Box

import androidx.compose.foundation.layout.PaddingValues

import androidx.compose.foundation.layout.height

import androidx.compose.foundation.layout.padding

import androidx.compose.foundation.selection.selectableGroup

import androidx.compose.material.icons.Icons
@@ -40,7 +39,6 @@ import androidx.compose.runtime.setValue 
import androidx.compose.ui.Modifier

import androidx.compose.ui.graphics.Color

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

import androidx.compose.ui.unit.DpOffset

import androidx.compose.ui.unit.dp

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

import com.android.settingslib.spa.framework.theme.SettingsTheme
@@ -60,13 +58,17 @@ fun Spinner(options: List<SpinnerOption>, selectedId: Int?, setId: (id: Int) -> 


    Box(

        modifier = Modifier

            .padding(SettingsDimension.itemPadding)

            .padding(

                start = SettingsDimension.itemPaddingStart,

                top = SettingsDimension.itemPaddingAround,

                end = SettingsDimension.itemPaddingEnd,

                bottom = SettingsDimension.itemPaddingAround,

            )

            .selectableGroup(),

    ) {

        val contentPadding = PaddingValues(horizontal = SettingsDimension.itemPaddingEnd)

        Button(

            onClick = { expanded = true },

            modifier = Modifier.height(36.dp),

            colors = ButtonDefaults.buttonColors(

                containerColor = SettingsTheme.colorScheme.spinnerHeaderContainer,

                contentColor = SettingsTheme.colorScheme.onSpinnerHeaderContainer,
@@ -86,7 +88,6 @@ fun Spinner(options: List<SpinnerOption>, selectedId: Int?, setId: (id: Int) -> 
            expanded = expanded,

            onDismissRequest = { expanded = false },

            modifier = Modifier.background(SettingsTheme.colorScheme.spinnerItemContainer),

            offset = DpOffset(x = 0.dp, y = 4.dp),

        ) {

            for (option in options) {

                DropdownMenuItem(
@@ -116,7 +117,9 @@ private fun SpinnerText( 
) {

    Text(

        text = option?.text ?: "",

        modifier = modifier.padding(end = SettingsDimension.itemPaddingEnd),

        modifier = modifier

            .padding(end = SettingsDimension.itemPaddingEnd)

            .padding(vertical = SettingsDimension.itemPaddingAround),

        color = color,

        style = MaterialTheme.typography.labelLarge,

    )