Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e1ff695 authored by Anton Potapov's avatar Anton Potapov
Browse files

Move icon to the end of inactive track

Flag: com.android.systemui.volume_redesign
Fixes: 417139744
Test: atest VolumeDialogScreenshotTest
Test: manual on foldable. Adjust volume and observe icon behaviour
Change-Id: I174895f2dfbca64678a84f232dae9ebfdc66298a
parent 435b88b0
Loading
Loading
Loading
Loading
+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,
                    )
                },
            )