Merge "[QSDetailedView] Make the button tappable area larger in the details view" into main (20f55532) · Commits · e / os / android_frameworks_base

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

+8 −19

Original line number	Original line	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.Column
	import androidx.compose.foundation.layout.Row		import androidx.compose.foundation.layout.Row
	import androidx.compose.foundation.layout.fillMaxWidth		import androidx.compose.foundation.layout.fillMaxWidth
	import androidx.compose.foundation.layout.height
	import androidx.compose.foundation.layout.heightIn		import androidx.compose.foundation.layout.heightIn
	import androidx.compose.foundation.layout.padding		import androidx.compose.foundation.layout.padding
	import androidx.compose.foundation.layout.width
	import androidx.compose.foundation.rememberScrollState		import androidx.compose.foundation.rememberScrollState
	import androidx.compose.foundation.verticalScroll		import androidx.compose.foundation.verticalScroll
	import androidx.compose.material.icons.Icons		import androidx.compose.material.icons.Icons
	@@ -100,16 +98,13 @@ fun TileDetails(modifier: Modifier = Modifier, detailsViewModel: DetailsViewMode
	IconButton(		IconButton(
	onClick = { detailsViewModel.closeDetailedView() },		onClick = { detailsViewModel.closeDetailedView() },
	colors = IconButtonDefaults.iconButtonColors(contentColor = colors.onSurface),		colors = IconButtonDefaults.iconButtonColors(contentColor = colors.onSurface),
	modifier =		modifier = Modifier.align(Alignment.CenterVertically),
	Modifier.align(Alignment.CenterVertically)
	.height(TileDetailsDefaults.IconHeight)
	.width(TileDetailsDefaults.IconWidth)
	.padding(start = TileDetailsDefaults.IconPadding),
	) {		) {
	Icon(		Icon(
	imageVector = Icons.AutoMirrored.Filled.ArrowBack,		imageVector = Icons.AutoMirrored.Filled.ArrowBack,
	// Description is TBD		// Description is TBD
	contentDescription = "Back to QS panel",		contentDescription = "Back to QS panel",
			tint = MaterialTheme.colorScheme.onSurface,
	)		)
	}		}
	Text(		Text(
	@@ -122,16 +117,13 @@ fun TileDetails(modifier: Modifier = Modifier, detailsViewModel: DetailsViewMode
	IconButton(		IconButton(
	onClick = { tileDetailedViewModel.clickOnSettingsButton() },		onClick = { tileDetailedViewModel.clickOnSettingsButton() },
	colors = IconButtonDefaults.iconButtonColors(contentColor = colors.onSurface),		colors = IconButtonDefaults.iconButtonColors(contentColor = colors.onSurface),
	modifier =		modifier = Modifier.align(Alignment.CenterVertically),
	Modifier.align(Alignment.CenterVertically)
	.height(TileDetailsDefaults.IconHeight)
	.width(TileDetailsDefaults.IconWidth)
	.padding(end = TileDetailsDefaults.IconPadding),
	) {		) {
	Icon(		Icon(
	imageVector = Icons.Default.Settings,		imageVector = Icons.Default.Settings,
	// Description is TBD		// Description is TBD
	contentDescription = "Go to Settings",		contentDescription = "Go to Settings",
			tint = MaterialTheme.colorScheme.onSurface,
	)		)
	}		}
	}		}
	@@ -163,13 +155,10 @@ private fun MapTileDetailsContent(tileDetailsViewModel: TileDetailsViewModel) {
	}		}

	private object TileDetailsDefaults {		private object TileDetailsDefaults {
	val IconHeight = 24.dp		val TitleRowStart = 2.dp
	val IconWidth = 24.dp		val TitleRowTop = 14.dp
	val IconPadding = 4.dp		val TitleRowEnd = 8.dp
	val TitleRowStart = 14.dp		val TitleRowBottom = 2.dp
	val TitleRowTop = 22.dp
	val TitleRowEnd = 20.dp
	val TitleRowBottom = 8.dp
	val DetailsMaxHeight = 600.dp		val DetailsMaxHeight = 600.dp
	val DetailsMinHeight = 300.dp		val DetailsMinHeight = 300.dp
	}		}