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

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

Merge "Remove excessive volume slider ripple" into main

parents 50c69551 18f68b13

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

+18 −23
Original line number Original line Diff line number Diff line
@@ -17,10 +17,10 @@ 
package com.android.systemui.volume.panel.component.volume.ui.composable

package com.android.systemui.volume.panel.component.volume.ui.composable





import androidx.compose.animation.core.animateFloatAsState

import androidx.compose.animation.core.animateFloatAsState

import androidx.compose.foundation.clickable

import androidx.compose.foundation.layout.Box

import androidx.compose.foundation.layout.Box

import androidx.compose.foundation.layout.fillMaxSize

import androidx.compose.foundation.layout.size

import androidx.compose.foundation.layout.size

import androidx.compose.material3.IconButton

import androidx.compose.material3.IconButtonColors

import androidx.compose.material3.LocalContentColor

import androidx.compose.material3.LocalContentColor

import androidx.compose.material3.Text

import androidx.compose.material3.Text

import androidx.compose.runtime.Composable

import androidx.compose.runtime.Composable
@@ -32,7 +32,6 @@ import androidx.compose.runtime.remember 
import androidx.compose.runtime.setValue

import androidx.compose.runtime.setValue

import androidx.compose.ui.Alignment

import androidx.compose.ui.Alignment

import androidx.compose.ui.Modifier

import androidx.compose.ui.Modifier

import androidx.compose.ui.graphics.Color

import androidx.compose.ui.semantics.ProgressBarRangeInfo

import androidx.compose.ui.semantics.ProgressBarRangeInfo

import androidx.compose.ui.semantics.clearAndSetSemantics

import androidx.compose.ui.semantics.clearAndSetSemantics

import androidx.compose.ui.semantics.contentDescription

import androidx.compose.ui.semantics.contentDescription
@@ -130,24 +129,20 @@ private fun SliderIcon( 
    isTappable: Boolean,

    isTappable: Boolean,

    modifier: Modifier = Modifier

    modifier: Modifier = Modifier

) {

) {

    val boxModifier =

        if (isTappable) {

        if (isTappable) {

        IconButton(

                modifier.clickable(

            modifier = modifier,

                    onClick = onIconTapped,

                    onClick = onIconTapped,

            colors =

                    interactionSource = null,

                IconButtonColors(

                    indication = null

                    contentColor = LocalContentColor.current,

                    containerColor = Color.Transparent,

                    disabledContentColor = LocalContentColor.current,

                    disabledContainerColor = Color.Transparent,

                ),

            content = { Icon(modifier = Modifier.size(24.dp), icon = icon) },

                )

                )

            } else {

            } else {

                modifier

            }

            .fillMaxSize()

    Box(

    Box(

            modifier = modifier,

        modifier = boxModifier,

        contentAlignment = Alignment.Center,

        contentAlignment = Alignment.Center,

        content = { Icon(modifier = Modifier.size(24.dp), icon = icon) },

        content = { Icon(modifier = Modifier.size(24.dp), icon = icon) },

    )

    )

}
 
}
 
}