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

Commit 39ad9801 authored by Jiaming Cheng's avatar Jiaming Cheng
Browse files

[QSDetailedView] Make the button tappable area larger in the details view 

Uset the default button size, which is the size in the mock.

Bug: 409632143
Flag: com.android.systemui.qs_tile_detailed_view
Test: Only change the view size. Existing unit tests still pass.
Change-Id: Iad50ad0c421e856a9536c32ced2ad6b446011255
parent 11126379

packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/TileDetails.kt

+8 −19
Original line number Diff line number Diff line
@@ -21,10 +21,8 @@ import androidx.compose.foundation.layout.Arrangement 
import androidx.compose.foundation.layout.Column

import androidx.compose.foundation.layout.Row

import androidx.compose.foundation.layout.fillMaxWidth

import androidx.compose.foundation.layout.height

import androidx.compose.foundation.layout.heightIn

import androidx.compose.foundation.layout.padding

import androidx.compose.foundation.layout.width

import androidx.compose.foundation.rememberScrollState

import androidx.compose.foundation.verticalScroll

import androidx.compose.material.icons.Icons
@@ -100,16 +98,13 @@ fun TileDetails(modifier: Modifier = Modifier, detailsViewModel: DetailsViewMode 
                IconButton(

                    onClick = { detailsViewModel.closeDetailedView() },

                    colors = IconButtonDefaults.iconButtonColors(contentColor = colors.onSurface),

                    modifier =

                        Modifier.align(Alignment.CenterVertically)

                            .height(TileDetailsDefaults.IconHeight)

                            .width(TileDetailsDefaults.IconWidth)

                            .padding(start = TileDetailsDefaults.IconPadding),

                    modifier = Modifier.align(Alignment.CenterVertically),

                ) {

                    Icon(

                        imageVector = Icons.AutoMirrored.Filled.ArrowBack,

                        // Description is TBD

                        contentDescription = "Back to QS panel",

                        tint = MaterialTheme.colorScheme.onSurface,

                    )

                }

                Text(
@@ -122,16 +117,13 @@ fun TileDetails(modifier: Modifier = Modifier, detailsViewModel: DetailsViewMode 
                IconButton(

                    onClick = { tileDetailedViewModel.clickOnSettingsButton() },

                    colors = IconButtonDefaults.iconButtonColors(contentColor = colors.onSurface),

                    modifier =

                        Modifier.align(Alignment.CenterVertically)

                            .height(TileDetailsDefaults.IconHeight)

                            .width(TileDetailsDefaults.IconWidth)

                            .padding(end = TileDetailsDefaults.IconPadding),

                    modifier = Modifier.align(Alignment.CenterVertically),

                ) {

                    Icon(

                        imageVector = Icons.Default.Settings,

                        // Description is TBD

                        contentDescription = "Go to Settings",

                        tint = MaterialTheme.colorScheme.onSurface,

                    )

                }

            }
@@ -163,13 +155,10 @@ private fun MapTileDetailsContent(tileDetailsViewModel: TileDetailsViewModel) { 
}



private object TileDetailsDefaults {

    val IconHeight = 24.dp

    val IconWidth = 24.dp

    val IconPadding = 4.dp

    val TitleRowStart = 14.dp

    val TitleRowTop = 22.dp

    val TitleRowEnd = 20.dp

    val TitleRowBottom = 8.dp

    val TitleRowStart = 2.dp

    val TitleRowTop = 14.dp

    val TitleRowEnd = 8.dp

    val TitleRowBottom = 2.dp

    val DetailsMaxHeight = 600.dp

    val DetailsMinHeight = 300.dp

}