Merge "Make ANC button label behaviour match the one in ButtonComponent" into main (5cefe9c7) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/anc/ui/composable/AncButtonComponent.kt

+3 −4

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.systemui.volume.panel.component.anc.ui.composable

		import androidx.compose.foundation.basicMarquee
		import androidx.compose.foundation.layout.Arrangement
		import androidx.compose.foundation.layout.Column
		import androidx.compose.foundation.layout.fillMaxWidth
		@@ -35,7 +36,6 @@ import androidx.compose.ui.semantics.clearAndSetSemantics
		import androidx.compose.ui.semantics.contentDescription
		import androidx.compose.ui.semantics.role
		import androidx.compose.ui.semantics.semantics
		import androidx.compose.ui.text.style.TextOverflow
		import androidx.compose.ui.unit.dp
		import com.android.systemui.res.R
		import com.android.systemui.volume.panel.component.anc.ui.viewmodel.AncViewModel
		@@ -81,11 +81,10 @@ constructor(
		onClick = onClick,
		)
		Text(
		modifier = Modifier.clearAndSetSemantics {},
		modifier = Modifier.clearAndSetSemantics {}.basicMarquee(),
		text = label,
		style = MaterialTheme.typography.labelMedium,
		maxLines = 1,
		overflow = TextOverflow.Ellipsis,
		maxLines = 2,
		)
		}
		}