Merge "Remove a11y actions for unmutable streams" into main (34649b10) · Commits · e / os / android_frameworks_base

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -68,9 +68,7 @@ fun VolumeSlider(
		state.a11yClickDescription?.let {
		customActions =
		listOf(
		CustomAccessibilityAction(
		it,
		) {
		CustomAccessibilityAction(it) {
		onIconTapped()
		true
		}

+12 −8

Original line number	Diff line number	Diff line
		@@ -146,6 +146,7 @@ constructor(
		isEnabled = isEnabled,
		a11yStep = volumeRange.step,
		a11yClickDescription =
		if (isAffectedByMute) {
		context.getString(
		if (isMuted) {
		R.string.volume_panel_hint_unmute
		@@ -153,7 +154,10 @@ constructor(
		R.string.volume_panel_hint_mute
		},
		label,
		),
		)
		} else {
		null
		},
		a11yStateDescription =
		if (volume == volumeRange.first) {
		context.getString(