Merge "Add test tags for the VolumePanel." into main (45ea8e5a) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -48,6 +48,7 @@ import com.android.compose.PlatformSlider
	import com.android.compose.PlatformSliderColors		import com.android.compose.PlatformSliderColors
	import com.android.systemui.common.shared.model.Icon		import com.android.systemui.common.shared.model.Icon
	import com.android.systemui.common.ui.compose.Icon		import com.android.systemui.common.ui.compose.Icon
			import com.android.systemui.compose.modifiers.sysuiResTag
	import com.android.systemui.volume.panel.component.volume.slider.ui.viewmodel.SliderState		import com.android.systemui.volume.panel.component.volume.slider.ui.viewmodel.SliderState

	@Composable		@Composable
	@@ -62,7 +63,7 @@ fun VolumeSlider(
	val value by valueState(state)		val value by valueState(state)
	PlatformSlider(		PlatformSlider(
	modifier =		modifier =
	modifier.clearAndSetSemantics {		modifier.sysuiResTag(state.label).clearAndSetSemantics {
	if (state.isEnabled) {		if (state.isEnabled) {
	contentDescription = state.label		contentDescription = state.label
	state.a11yClickDescription?.let {		state.a11yClickDescription?.let {

packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/ui/composable/VolumePanelRoot.kt

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -25,20 +25,25 @@ import androidx.compose.foundation.layout.padding
	import androidx.compose.runtime.Composable		import androidx.compose.runtime.Composable
	import androidx.compose.runtime.getValue		import androidx.compose.runtime.getValue
	import androidx.compose.ui.Alignment		import androidx.compose.ui.Alignment
			import androidx.compose.ui.ExperimentalComposeUiApi
	import androidx.compose.ui.Modifier		import androidx.compose.ui.Modifier
	import androidx.compose.ui.res.stringResource		import androidx.compose.ui.res.stringResource
	import androidx.compose.ui.semantics.paneTitle		import androidx.compose.ui.semantics.paneTitle
	import androidx.compose.ui.semantics.semantics		import androidx.compose.ui.semantics.semantics
	import androidx.compose.ui.unit.dp		import androidx.compose.ui.unit.dp
	import androidx.lifecycle.compose.collectAsStateWithLifecycle		import androidx.lifecycle.compose.collectAsStateWithLifecycle
			import com.android.systemui.compose.modifiers.sysuiResTag
	import com.android.systemui.res.R		import com.android.systemui.res.R
	import com.android.systemui.volume.panel.ui.layout.ComponentsLayout		import com.android.systemui.volume.panel.ui.layout.ComponentsLayout
	import com.android.systemui.volume.panel.ui.viewmodel.VolumePanelState		import com.android.systemui.volume.panel.ui.viewmodel.VolumePanelState
	import com.android.systemui.volume.panel.ui.viewmodel.VolumePanelViewModel		import com.android.systemui.volume.panel.ui.viewmodel.VolumePanelViewModel

			/** Same as android.platform.systemui_tapl.ui.VolumePanel#VolumePanelTestTag */
			private const val VolumePanelTestTag = "VolumePanel"
	private val padding = 24.dp		private val padding = 24.dp

	@Composable		@Composable
			@OptIn(ExperimentalComposeUiApi::class)
	fun VolumePanelRoot(		fun VolumePanelRoot(
	viewModel: VolumePanelViewModel,		viewModel: VolumePanelViewModel,
	modifier: Modifier = Modifier,		modifier: Modifier = Modifier,
	@@ -52,6 +57,7 @@ fun VolumePanelRoot(
	Components(		Components(
	componentsState,		componentsState,
	modifier		modifier
			.sysuiResTag(VolumePanelTestTag)
	.semantics { paneTitle = accessibilityTitle }		.semantics { paneTitle = accessibilityTitle }
	.padding(		.padding(
	start = padding,		start = padding,