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

Commit 55323b0b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Pass slider value when scroll finishes"" into main

parents acee2b54 342a6cc7

packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsShadeOverlay.kt

+1 −1
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ fun ContentScope.QuickSettingsLayout( 
                                volumeSliderViewModel.onValueChanged(volumeSliderState, newValue)

                            },

                            onValueChangeFinished = {

                                volumeSliderViewModel.onValueChangeFinished(it)

                                volumeSliderViewModel.onValueChangeFinished()

                            },

                            onIconTapped = { volumeSliderViewModel.toggleMuted(volumeSliderState) },

                            sliderColors = PlatformSliderDefaults.defaultPlatformSliderColors(),

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

+2 −2
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ fun ColumnVolumeSliders( 
                onValueChange = { newValue: Float ->

                    sliderViewModel.onValueChanged(sliderState, newValue)

                },

                onValueChangeFinished = { sliderViewModel.onValueChangeFinished(it) },

                onValueChangeFinished = { sliderViewModel.onValueChangeFinished() },

                onIconTapped = { sliderViewModel.toggleMuted(sliderState) },

                sliderColors = sliderColors,

                hapticsViewModelFactory = sliderViewModel.getSliderHapticsViewModelFactory(),
@@ -188,7 +188,7 @@ fun ColumnVolumeSliders( 
                            onValueChange = { newValue: Float ->

                                sliderViewModel.onValueChanged(sliderState, newValue)

                            },

                            onValueChangeFinished = { sliderViewModel.onValueChangeFinished(it) },

                            onValueChangeFinished = { sliderViewModel.onValueChangeFinished() },

                            onIconTapped = { sliderViewModel.toggleMuted(sliderState) },

                            sliderColors = sliderColors,

                            hapticsViewModelFactory =

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

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ fun GridVolumeSliders( 
                onValueChange = { newValue: Float ->

                    sliderViewModel.onValueChanged(sliderState, newValue)

                },

                onValueChangeFinished = { sliderViewModel.onValueChangeFinished(it) },

                onValueChangeFinished = { sliderViewModel.onValueChangeFinished() },

                onIconTapped = { sliderViewModel.toggleMuted(sliderState) },

                sliderColors = sliderColors,

                hapticsViewModelFactory = sliderViewModel.getSliderHapticsViewModelFactory(),

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
@@ -99,7 +99,7 @@ fun VolumeSlider( 
    sliderColors: PlatformSliderColors,

    modifier: Modifier = Modifier,

    hapticsViewModelFactory: SliderHapticsViewModel.Factory?,

    onValueChangeFinished: ((Float) -> Unit)? = null,

    onValueChangeFinished: (() -> Unit)? = null,

    button: (@Composable RowScope.() -> Unit)? = null,

    showLabel: Boolean = true,

) {
@@ -146,7 +146,7 @@ fun VolumeSlider( 
                    value = state.value,

                    valueRange = state.valueRange,

                    onValueChanged = onValueChange,

                    onValueChangeFinished = { onValueChangeFinished?.invoke(it) },

                    onValueChangeFinished = { onValueChangeFinished?.invoke() },

                    colors = materialSliderColors,

                    isEnabled = state.isEnabled,

                    stepDistance = state.step,
@@ -262,7 +262,7 @@ private fun LegacyVolumeSlider( 
    sliderColors: PlatformSliderColors,

    hapticsViewModelFactory: SliderHapticsViewModel.Factory?,

    modifier: Modifier = Modifier,

    onValueChangeFinished: ((Float) -> Unit)? = null,

    onValueChangeFinished: (() -> Unit)? = null,

) {

    val value by valueState(state)

    val interactionSource = remember { MutableInteractionSource() }
@@ -322,7 +322,7 @@ private fun LegacyVolumeSlider( 
        },

        onValueChangeFinished = {

            hapticsViewModel?.onValueChangeEnded()

            onValueChangeFinished?.invoke(value)

            onValueChangeFinished?.invoke()

        },

        enabled = state.isEnabled,

        icon = {

packages/SystemUI/src/com/android/systemui/volume/panel/component/volume/slider/ui/viewmodel/AudioSharingStreamSliderViewModel.kt

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ constructor( 
        volumeChanges.tryEmit(newValue.roundToInt())

    }



    override fun onValueChangeFinished(newValue: Float) {

    override fun onValueChangeFinished() {

        uiEventLogger.log(VolumePanelUiEvent.VOLUME_PANEL_AUDIO_SHARING_SLIDER_TOUCHED)

    }