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

Commit 18f68b13 authored by Anton Potapov's avatar Anton Potapov
Browse files

Remove excessive volume slider ripple 

Flag: aconfig new_volume_panel TRUNKFOOD
Test: manual on the phone. Tap on the icon at the start of the
VolumeSlider
Fixes: 330807799

Change-Id: I7b1dc2dff1b76d3012c354cd8b6802e6b922d069
parent 7e865633

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

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



import androidx.compose.animation.core.animateFloatAsState

import androidx.compose.foundation.clickable

import androidx.compose.foundation.layout.Box

import androidx.compose.foundation.layout.fillMaxSize

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.Text

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

import androidx.compose.ui.Alignment

import androidx.compose.ui.Modifier

import androidx.compose.ui.graphics.Color

import androidx.compose.ui.semantics.ProgressBarRangeInfo

import androidx.compose.ui.semantics.clearAndSetSemantics

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

    modifier: Modifier = Modifier

) {

    val boxModifier =

        if (isTappable) {

        IconButton(

            modifier = modifier,

                modifier.clickable(

                    onClick = onIconTapped,

            colors =

                IconButtonColors(

                    contentColor = LocalContentColor.current,

                    containerColor = Color.Transparent,

                    disabledContentColor = LocalContentColor.current,

                    disabledContainerColor = Color.Transparent,

                ),

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

                    interactionSource = null,

                    indication = null

                )

            } else {

                modifier

            }

            .fillMaxSize()

    Box(

            modifier = modifier,

        modifier = boxModifier,

        contentAlignment = Alignment.Center,

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

    )

}
 
}