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

Commit fc3e7ff5 authored by Olivier St-Onge's avatar Olivier St-Onge
Browse files

Keep the animateItem modifier but remove the placementSpec on selected tiles 

Removing the animateItem spec caused the tile to lose track of previous positions in the grid if we quickly unselected and moved, such as when we're undoing a move.
Keeping the animateItem modifier at all times keeps track of that offset while still stopping the tiles from animating when we don't want it to.

Test: manually undoing tile moves
Flag: com.android.systemui.qs_ui_refactor_compose_fragment
Fixes: 413527151
Change-Id: I922cc3fb26b9af3a75ee3b5eebd7363e3f101c12
parent a60b62c5

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

+13 −14
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ import com.android.systemui.qs.panels.ui.compose.infinitegrid.EditModeTileDefaul 
import com.android.systemui.qs.panels.ui.compose.infinitegrid.EditModeTileDefaults.AvailableTilesGridMinHeight

import com.android.systemui.qs.panels.ui.compose.infinitegrid.EditModeTileDefaults.CurrentTilesGridPadding

import com.android.systemui.qs.panels.ui.compose.infinitegrid.EditModeTileDefaults.GridBackgroundCornerRadius

import com.android.systemui.qs.panels.ui.compose.infinitegrid.EditModeTileDefaults.TilePlacementSpec

import com.android.systemui.qs.panels.ui.compose.selection.InteractiveTileContainer

import com.android.systemui.qs.panels.ui.compose.selection.MutableSelectionState

import com.android.systemui.qs.panels.ui.compose.selection.ResizingState
@@ -831,24 +832,16 @@ private fun LazyGridItemScope.TileGridCell( 
            TileState.GreyedOut -> null

        }



    // TODO(b/412357793) Remove this workaround when animateItem is fixed for RTL grids

    // Don't apply the placementSpec to the selected tile as it interferes with

    // the resizing animation. The selection can't change positions without selecting a

    // different tile, so this isn't needed regardless.

    val placementSpec = if (tileState != TileState.Selected) TilePlacementSpec else null

    InteractiveTileContainer(

        tileState = tileState,

        resizingState = resizingState,

        modifier =

            modifier.height(TileHeight).fillMaxWidth().thenIf(tileState != TileState.Selected) {

                // TODO(b/412357793) Remove this workaround when animateItem is fixed for RTL grids

                // Don't apply the animateItem modifier to the selected tile as it interferes with

                // the resizing animation. The selection can't change positions without selecting a

                // different tile, so this isn't needed regardless.

                Modifier.animateItem(

                    placementSpec =

                        spring(

                            stiffness = Spring.StiffnessMediumLow,

                            dampingRatio = Spring.DampingRatioLowBouncy,

                            visibilityThreshold = IntOffset.VisibilityThreshold,

                        )

                )

            },

            modifier.height(TileHeight).fillMaxWidth().animateItem(placementSpec = placementSpec),

        onClick = {

            if (tileState == TileState.Removable) {

                onRemoveTile(cell.tile.tileSpec)
@@ -1168,6 +1161,12 @@ private object EditModeTileDefaults { 
    val CurrentTilesGridPadding = 10.dp

    val AvailableTilesGridMinHeight = 200.dp

    val GridBackgroundCornerRadius = 28.dp

    val TilePlacementSpec =

        spring(

            stiffness = Spring.StiffnessMediumLow,

            dampingRatio = Spring.DampingRatioLowBouncy,

            visibilityThreshold = IntOffset.VisibilityThreshold,

        )



    @Composable

    fun editTileColors(): TileColors =