commit d4d9ca9ab17fb01dcd2980671dac4ba621dc70d1
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Nov 12 20:36:46 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 12 20:36:46 2024 +0000
tree 445dbb9737e5c99d2646348f63f22f44acdf9576
parent c3696effd10d708d117627521a1a5f097ec8d85d
parent dab63b1b5fa97bf1550aae51a7c8ecdd2865c72f

Merge "Use the correct background color for tiles." into main

packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/Tile.kt

diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/Tile.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/Tile.kt
index 7ff43c6..fe59c4d3 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/Tile.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/Tile.kt
@@ -130,15 +130,7 @@
 
     // TODO(b/361789146): Draw the shapes instead of clipping
     val tileShape = TileDefaults.animateTileShape(uiState.state)
-    val animatedColor by
-        animateColorAsState(
-            if (iconOnly || !uiState.handlesSecondaryClick) {
-                colors.iconBackground
-            } else {
-                colors.background
-            },
-            label = "QSTileBackgroundColor",
-        )
+    val animatedColor by animateColorAsState(colors.background, label = "QSTileBackgroundColor")
 
     TileExpandable(
         color = { animatedColor },