PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding ReorderParameters to ReorderAlgorithm

Browse Source 
No logic change made.

Flag: NA
Bug: 229292911
Test: ReorderAlgorithmUnitTest
Change-Id: Iababd2fba688a482cffe6d2243c987b0c022c6a5
This commit is contained in:
Sebastian Franco
2023-12-02 13:54:05 -06:00
parent b70b7fde7a
commit 25f8e406a7
5 changed files with 157 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/celllayout/MulticellReorderAlgorithm.java
+10 -14
View File
@@ -48,28 +48,24 @@ public class MulticellReorderAlgorithm extends ReorderAlgorithm {
}
@Override
public ItemConfiguration closestEmptySpaceReorder(int pixelX, int pixelY, int minSpanX,
int minSpanY, int spanX, int spanY) {
public ItemConfiguration closestEmptySpaceReorder(ReorderParameters reorderParameters) {
return removeSeamFromSolution(simulateSeam(
() -> super.closestEmptySpaceReorder(pixelX, pixelY, minSpanX, minSpanY, spanX,
spanY)));
() -> super.closestEmptySpaceReorder(reorderParameters))
);
}
@Override
public ItemConfiguration findReorderSolution(int pixelX, int pixelY, int minSpanX,
int minSpanY, int spanX, int spanY, int[] direction, View dragView, boolean decX,
ItemConfiguration solution) {
public ItemConfiguration findReorderSolution(ReorderParameters reorderParameters,
boolean decX) {
return removeSeamFromSolution(simulateSeam(
() -> super.findReorderSolution(pixelX, pixelY, minSpanX, minSpanY, spanX, spanY,
direction, dragView, decX, solution)));
() -> super.findReorderSolution(reorderParameters, decX)));
}
@Override
public ItemConfiguration dropInPlaceSolution(int pixelX, int pixelY, int spanX,
int spanY,
View dragView) {
return removeSeamFromSolution(simulateSeam(
() -> super.dropInPlaceSolution(pixelX, pixelY, spanX, spanY, dragView)));
public ItemConfiguration dropInPlaceSolution(ReorderParameters reorderParameters) {
return removeSeamFromSolution(
simulateSeam(() -> super.dropInPlaceSolution(reorderParameters))
);
}
void addSeam() {