Merge "Fix drop zone for edit tiles" into main (ce93717f) · Commits · e / os / android_frameworks_base

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

+3 −6

Original line number	Diff line number	Diff line
		@@ -246,16 +246,14 @@ fun DefaultEditTileGrid(
		// the top bar
		.padding(top = innerPadding.calculateTopPadding())
		.clipScrollableContainer(Orientation.Vertical)
		.verticalScroll(scrollState),
		.verticalScroll(scrollState)
		.dragAndDropRemoveZone(listState, onRemoveTile),
		) {
		AnimatedContent(
		targetState = listState.dragInProgress \|\| selectionState.selected,
		label = "QSEditHeader",
		) { showRemoveTarget ->
		EditGridHeader(
		Modifier.dragAndDropRemoveZone(listState, onRemoveTile)
		.padding(bottom = 26.dp)
		) {
		EditGridHeader(Modifier.padding(bottom = 26.dp)) {
		if (showRemoveTarget) {
		RemoveTileTarget {
		selectionState.selection?.let {
		@@ -284,7 +282,6 @@ fun DefaultEditTileGrid(
		Modifier.fillMaxWidth()
		.requiredHeightIn(AvailableTilesGridMinHeight)
		.animateContentSize()
		.dragAndDropRemoveZone(listState, onRemoveTile)
		) {
		// Using the fully qualified name here as a workaround for AnimatedVisibility
		// not being available from a Box