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

Commit 932f5d40 authored by Anton Potapov's avatar Anton Potapov
Browse files

Remove creating mutable states for the animation 

With the new sliders an old logic of enabled-disabled state transition
without an animation is no longer relevant so we can omit that altogether.

Flag: com.android.systemui.volume_redesign
Fixes: 405549844
Test: atest VolumeDialogScreenshotTest
Test: manual on foldable. Adjust volume with swipes and physical buttons
and observe the animation

Change-Id: Iaf2caf079b160be356d3a117430a635b09e789e5
parent d3af2e14

packages/SystemUI/src/com/android/systemui/volume/ui/compose/slider/Slider.kt

+16 −31
Original line number Diff line number Diff line
@@ -32,10 +32,8 @@ import androidx.compose.material3.SliderState 
import androidx.compose.material3.VerticalSlider

import androidx.compose.runtime.Composable

import androidx.compose.runtime.LaunchedEffect

import androidx.compose.runtime.State

import androidx.compose.runtime.getValue

import androidx.compose.runtime.mutableFloatStateOf

import androidx.compose.runtime.mutableStateOf

import androidx.compose.runtime.remember

import androidx.compose.runtime.setValue

import androidx.compose.runtime.snapshotFlow
@@ -81,12 +79,21 @@ fun Slider( 
        )

    },

) {

    require(stepDistance >= 0) { "stepDistance must not be negative" }

    val snappedValue by valueState(value, isEnabled)

    val hapticsViewModel = haptics.createViewModel(snappedValue, valueRange, interactionSource)

    require(stepDistance >= 0f) { "stepDistance must not be negative" }

    val animatedValue by

        animateFloatAsState(

            targetValue = value,

            animationSpec =

                spring(

                    dampingRatio = Spring.DampingRatioNoBouncy,

                    stiffness = Spring.StiffnessMedium,

                ),

            label = "VolumeSliderValueAnimation",

        )

    val hapticsViewModel = haptics.createViewModel(animatedValue, valueRange, interactionSource)



    val sliderState =

        remember(valueRange) { SliderState(value = snappedValue, valueRange = valueRange) }

        remember(valueRange) { SliderState(value = animatedValue, valueRange = valueRange) }

    val valueChange: (Float) -> Unit = { newValue ->

        hapticsViewModel?.onValueChange(newValue)

        onValueChanged(newValue)
@@ -94,7 +101,7 @@ fun Slider( 
    val semantics =

        createSemantics(

            accessibilityParams,

            snappedValue,

            value,

            valueRange,

            valueChange,

            isEnabled,
@@ -103,10 +110,10 @@ fun Slider( 


    sliderState.onValueChangeFinished = {

        hapticsViewModel?.onValueChangeEnded()

        onValueChangeFinished?.invoke(snappedValue)

        onValueChangeFinished?.invoke(animatedValue)

    }

    sliderState.onValueChange = valueChange

    sliderState.value = snappedValue

    sliderState.value = animatedValue



    if (isVertical) {

        VerticalSlider(
@@ -132,28 +139,6 @@ fun Slider( 
    }

}



@Composable

private fun valueState(targetValue: Float, isEnabled: Boolean): State<Float> {

    var prevValue by remember { mutableFloatStateOf(targetValue) }

    var prevEnabled by remember { mutableStateOf(isEnabled) }

    // Don't animate slider value when receive the first value and when changing isEnabled state

    val value =

        if (prevEnabled != isEnabled) mutableFloatStateOf(targetValue)

        else

            animateFloatAsState(

                targetValue = targetValue,

                animationSpec =

                    spring(

                        dampingRatio = Spring.DampingRatioNoBouncy,

                        stiffness = Spring.StiffnessMedium,

                    ),

                label = "VolumeSliderValueAnimation",

            )

    prevValue = targetValue

    prevEnabled = isEnabled

    return value

}



private fun createSemantics(

    params: AccessibilityParams,

    value: Float,