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

Commit acf3ecd2 authored by Anton Potapov's avatar Anton Potapov Committed by Android (Google) Code Review
Browse files

Merge "Pass slider value when scroll finishes" into main

parents db3262e8 c2cd2b44

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

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

                            },

                            onValueChangeFinished = {

                                volumeSliderViewModel.onValueChangeFinished()

                                volumeSliderViewModel.onValueChangeFinished(it)

                            },

                            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() },

                onValueChangeFinished = { sliderViewModel.onValueChangeFinished(it) },

                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() },

                            onValueChangeFinished = { sliderViewModel.onValueChangeFinished(it) },

                            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() },

                onValueChangeFinished = { sliderViewModel.onValueChangeFinished(it) },

                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: (() -> Unit)? = null,

    onValueChangeFinished: ((Float) -> 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() },

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

                    colors = materialSliderColors,

                    isEnabled = state.isEnabled,

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

    hapticsViewModelFactory: SliderHapticsViewModel.Factory?,

    modifier: Modifier = Modifier,

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

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

) {

    val value by valueState(state)

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

        onValueChangeFinished = {

            hapticsViewModel?.onValueChangeEnded()

            onValueChangeFinished?.invoke()

            onValueChangeFinished?.invoke(value)

        },

        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() {

    override fun onValueChangeFinished(newValue: Float) {

        uiEventLogger.log(VolumePanelUiEvent.VOLUME_PANEL_AUDIO_SHARING_SLIDER_TOUCHED)

    }