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

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

Merge "Add color change animations to PlatformSlider." into main

parents 8800a495 4d95be4c

packages/SystemUI/compose/core/src/com/android/compose/PlatformSlider.kt

+12 −2
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ 




package com.android.compose

package com.android.compose





import androidx.compose.animation.animateColorAsState

import androidx.compose.animation.core.animateDpAsState

import androidx.compose.animation.core.animateDpAsState

import androidx.compose.animation.core.animateFloatAsState

import androidx.compose.animation.core.animateFloatAsState

import androidx.compose.foundation.Canvas

import androidx.compose.foundation.Canvas
@@ -266,8 +267,17 @@ private fun TrackBackground( 
            label = "PlatformSliderCornersAnimation",

            label = "PlatformSliderCornersAnimation",

        )

        )





    val trackColor = colors.getTrackColor(enabled)

    val trackColor by

    val indicatorColor = colors.getIndicatorColor(enabled)

        animateColorAsState(

            colors.getTrackColor(enabled),

            label = "PlatformSliderTrackColorAnimation",

        )



    val indicatorColor by

        animateColorAsState(

            colors.getIndicatorColor(enabled),

            label = "PlatformSliderIndicatorColorAnimation",

        )

    Canvas(modifier.fillMaxSize()) {

    Canvas(modifier.fillMaxSize()) {

        val trackCornerRadius = CornerRadius(size.height / 2, size.height / 2)

        val trackCornerRadius = CornerRadius(size.height / 2, size.height / 2)

        val trackPath = Path()

        val trackPath = Path()