Merge "Move icon to the end of inactive track" into main (ef4d9c46) · Commits · e / os / android_frameworks_base

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -158,25 +158,25 @@ fun VolumeSlider(
		sliderState = sliderState,
		colors = materialSliderColors,
		isEnabled = state.isEnabled,
		activeTrackStartIcon =
		activeTrackEndIcon =
		state.icon?.let { icon ->
		{ iconsState ->
		SliderIcon(
		icon = {
		Icon(icon = icon, modifier = Modifier.size(24.dp))
		},
		isVisible = iconsState.isActiveTrackStartIconVisible,
		isVisible = !iconsState.isInactiveTrackEndIconVisible,
		)
		}
		},
		inactiveTrackStartIcon =
		inactiveTrackEndIcon =
		state.icon?.let { icon ->
		{ iconsState ->
		SliderIcon(
		icon = {
		Icon(icon = icon, modifier = Modifier.size(24.dp))
		},
		isVisible = !iconsState.isActiveTrackStartIconVisible,
		isVisible = iconsState.isInactiveTrackEndIconVisible,
		)
		}
		},

+4 −4

Original line number	Diff line number	Diff line
		@@ -136,20 +136,20 @@ private fun VolumeDialogSlider(
		colors = colors,
		isEnabled = !sliderStateModel.isDisabled,
		isVertical = true,
		activeTrackStartIcon = { iconsState ->
		activeTrackEndIcon = { iconsState ->
		SliderIcon(
		icon = {
		Icon(icon = sliderStateModel.icon, modifier = Modifier.size(20.dp))
		},
		isVisible = iconsState.isActiveTrackStartIconVisible,
		isVisible = !iconsState.isInactiveTrackEndIconVisible,
		)
		},
		inactiveTrackStartIcon = { iconsState ->
		inactiveTrackEndIcon = { iconsState ->
		SliderIcon(
		icon = {
		Icon(icon = sliderStateModel.icon, modifier = Modifier.size(20.dp))
		},
		isVisible = !iconsState.isActiveTrackStartIconVisible,
		isVisible = iconsState.isInactiveTrackEndIconVisible,
		)
		},
		)