commit 5817b2700e7051b209f563be7d5b74ea7d9e7172
author amehfooz <amehfooz@google.com> Fri Apr 25 18:02:02 2025 +0000
committer burakov <burakov@google.com> Mon Apr 28 09:29:11 2025 +0000
tree 284b642aa1def2259e61a79d7766031544fbca7c
parent 59956d6abc676ab8d246c235daa6402fd9bd72f2

[Dual Shade] Fix SystemIconChip hover behavior

Uses default hover and ripple indication to match
UX specs.
The chip shape is now applied via a Clip modifier
so both the ripple and background share it.

Bug: 408486251
Test: manual, video in bug
Flag: com.android.systemui.scene_container

Change-Id: Iede60e03cdbbe5f51575bf792191dd86a78214d7

packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeHeader.kt

diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeHeader.kt b/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeHeader.kt
index c1dc9a69..2510cf5 100644
--- a/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeHeader.kt
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeHeader.kt
@@ -51,6 +51,7 @@
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.TransformOrigin
 import androidx.compose.ui.graphics.graphicsLayer
@@ -756,29 +757,21 @@
     onClick: (() -> Unit)? = null,
     content: @Composable RowScope.() -> Unit,
 ) {
-    val interactionSource = remember { MutableInteractionSource() }
-    val isHovered by interactionSource.collectIsHoveredAsState()
-    val hoverModifier =
-        with(MaterialTheme.colorScheme) {
-            Modifier.background(onScrimDim, RoundedCornerShape(CollapsedHeight / 4))
-        }
-
     Row(
         verticalAlignment = Alignment.CenterVertically,
         modifier =
             modifier
-                .thenIf(backgroundColor != Color.Unspecified) {
-                    Modifier.background(backgroundColor, RoundedCornerShape(25.dp))
-                        .padding(horizontal = ChipPaddingHorizontal, vertical = ChipPaddingVertical)
-                }
+                .clip(RoundedCornerShape(25.dp))
                 .thenIf(onClick != null) {
                     Modifier.clickable(
-                        interactionSource = interactionSource,
-                        indication = null,
                         onClick = { onClick?.invoke() },
                     )
                 }
-                .thenIf(isHovered) { hoverModifier },
+                .thenIf(backgroundColor != Color.Unspecified) {
+                    Modifier.background(backgroundColor)
+                        .padding(horizontal = ChipPaddingHorizontal, vertical = ChipPaddingVertical)
+                },
+
         content = content,
     )
 }