Merge "Update Volume Panel dimentions for the redesign" into main (b9ca0695) · Commits · e / os / android_frameworks_base

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

+43 −38

Original line number	Diff line number	Diff line
		@@ -101,20 +101,21 @@ fun VolumeSlider(
		Column(modifier) {
		Row(
		horizontalArrangement = Arrangement.spacedBy(12.dp),
		modifier = Modifier.fillMaxWidth(),
		modifier = Modifier.fillMaxWidth().height(40.dp),
		verticalAlignment = Alignment.CenterVertically,
		) {
		state.icon?.let {
		Icon(
		icon = it,
		tint = MaterialTheme.colorScheme.onSurface,
		modifier = Modifier.size(40.dp).padding(8.dp),
		modifier = Modifier.size(24.dp),
		)
		}
		Text(
		text = state.label,
		style = MaterialTheme.typography.titleMedium,
		color = MaterialTheme.colorScheme.onSurface,
		modifier = Modifier.weight(1f).align(Alignment.CenterVertically),
		modifier = Modifier.weight(1f),
		)
		button?.invoke()
		}
		@@ -125,7 +126,10 @@ fun VolumeSlider(
		onValueChangeFinished = onValueChangeFinished,
		enabled = state.isEnabled,
		modifier =
		Modifier.height(40.dp).sysuiResTag(state.label).clearAndSetSemantics {
		Modifier.height(40.dp)
		.padding(vertical = 8.dp)
		.sysuiResTag(state.label)
		.clearAndSetSemantics {
		if (state.isEnabled) {
		contentDescription = state.label
		state.a11yClickDescription?.let {
		@@ -139,7 +143,8 @@ fun VolumeSlider(
		}

		state.a11yStateDescription?.let { stateDescription = it }
		progressBarRangeInfo = ProgressBarRangeInfo(state.value, state.valueRange)
		progressBarRangeInfo =
		ProgressBarRangeInfo(state.value, state.valueRange)
		} else {
		disabled()
		contentDescription =