Merge "Fix loaded tile icon animations in compose" into main (a5fe2169) · Commits · e / os / android_frameworks_base

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

+9 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.systemui.qs.panels.ui.compose.infinitegrid

		import android.graphics.drawable.Animatable
		import android.graphics.drawable.AnimatedVectorDrawable
		import android.graphics.drawable.Drawable
		import android.text.TextUtils
		import androidx.compose.animation.animateColorAsState
		@@ -228,7 +229,14 @@ fun SmallTileContent(
		}
		}
		}
		is Icon.Loaded -> rememberDrawablePainter(loadedDrawable)
		is Icon.Loaded -> {
		LaunchedEffect(loadedDrawable) {
		if (loadedDrawable is AnimatedVectorDrawable) {
		loadedDrawable.forceAnimationOnUI()
		}
		}
		rememberDrawablePainter(loadedDrawable)
		}
		}

		Image(