Merge "[Task manager] Set the content description for the number button" into main (ec612903) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/qs/footer/ui/compose/FooterActions.kt

+6 −1

Original line number	Diff line number	Diff line
		@@ -256,6 +256,7 @@ private fun RowScope.ForegroundServicesButton(
		} else {
		NumberButton(
		model.foregroundServicesCount,
		contentDescription = model.text,
		showNewDot = model.hasNewChanges,
		onClick = model.onClick,
		)
		@@ -284,6 +285,7 @@ fun IconButton(model: FooterActionsButtonViewModel, modifier: Modifier = Modifie
		@Composable
		private fun NumberButton(
		number: Int,
		contentDescription: String,
		showNewDot: Boolean,
		onClick: (Expandable) -> Unit,
		modifier: Modifier = Modifier,
		@@ -314,7 +316,10 @@ private fun NumberButton(
		) {
		Text(
		number.toString(),
		modifier = Modifier.align(Alignment.Center),
		modifier =
		Modifier.align(Alignment.Center).semantics {
		this.contentDescription = contentDescription
		},
		style = MaterialTheme.typography.bodyLarge,
		color = colorAttr(R.attr.onShadeInactiveVariant),
		// TODO(b/242040009): This should only use a standard text style instead and