Merge "Remove the dragged tile when existing the current tiles grid" into main (f957f4a0) · Commits · e / os / android_frameworks_base

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

+5 −6

Original line number	Diff line number	Diff line
		@@ -92,12 +92,6 @@ fun Modifier.dragAndDropRemoveZone(
		true
		} ?: false
		}

		override fun onEntered(event: DragAndDropEvent) {
		if (!dragAndDropState.isDraggedCellRemovable) return

		dragAndDropState.movedOutOfBounds()
		}
		}
		}
		return dragAndDropTarget(
		@@ -131,6 +125,11 @@ fun Modifier.dragAndDropTileList(
		dragAndDropState.onDrop()
		}

		override fun onExited(event: DragAndDropEvent) {
		if (!dragAndDropState.isDraggedCellRemovable) return
		dragAndDropState.movedOutOfBounds()
		}

		override fun onMoved(event: DragAndDropEvent) {
		val offset = event.toOffset()
		dragAndDropState.onMoved(offset)

+0 −11

Original line number	Diff line number	Diff line
		@@ -186,17 +186,6 @@ class EditTileListState(
		}
		}

		private fun List<TileGridCell>.updateLargeWidth(
		previousWidth: Int,
		newWidth: Int,
		): List<TileGridCell> {
		return if (previousWidth != newWidth) {
		map { if (!it.isIcon) it.copy(width = newWidth) else it }
		} else {
		this
		}
		}

		private fun List<EditTileViewModel>.toGridCells(largeTiles: Set<TileSpec>): List<GridCell> {
		return map {
		SizedTileImpl(it, if (largeTiles.contains(it.tileSpec)) largeTilesSpan else 1)