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

Commit 967f73e3 authored by Lucas Silva's avatar Lucas Silva
Browse files

Disable fade-out animation on grid items 

Modifier.animateItem's fade out animation is not supported when the grid
contains AndroidView instances. In this case, the animation breaks and
is flashing unrelated pieces of UI during the fade.

Fixes: 376495198
Test: manually by flashing and removing items from the grid
Flag: EXEMPT bugfix
Change-Id: I436f0f8972616d1bf017b1f3e2e1e6be37fdc2c3
parent 7de9e84a

packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt

+11 −6
Original line number Diff line number Diff line
@@ -931,7 +931,9 @@ private fun BoxScope.CommunalHubLazyGrid( 
                        Modifier.requiredSize(dpSize)

                            .thenIf(!isItemDragging) {

                                Modifier.animateItem(

                                    placementSpec = spring(stiffness = Spring.StiffnessMediumLow)

                                    placementSpec = spring(stiffness = Spring.StiffnessMediumLow),

                                    // See b/376495198 - not supported with AndroidView

                                    fadeOutSpec = null,

                                )

                            }

                            .thenIf(isItemDragging) { Modifier.zIndex(1f) },
@@ -980,9 +982,12 @@ private fun BoxScope.CommunalHubLazyGrid( 
                    size = size,

                    selected = false,

                    modifier =

                        Modifier.requiredSize(dpSize).animateItem().thenIf(

                            communalResponsiveGrid()

                        ) {

                        Modifier.requiredSize(dpSize)

                            .animateItem(

                                // See b/376495198 - not supported with AndroidView

                                fadeOutSpec = null

                            )

                            .thenIf(communalResponsiveGrid()) {

                                Modifier.graphicsLayer { alpha = itemAlpha?.value ?: 1f }

                            },

                    index = index,