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

Moving classes inside of CellLayout to their own file

Browse Source 
This is a no-op change ensure this we have ReorderAlgorithmUnitTest.

Flag: NA
Bug: 229292911
Test: ReorderAlgorithmUnitTest
Change-Id: I6ffe2a1260f869a4686a9f1e652dd1ab6d406269
This commit is contained in:
Sebastian Franco
2023-11-21 10:45:45 -06:00
committed by Sebastián Franco
parent 5f14285de1
commit 5f0af4f633
13 changed files with 362 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/celllayout/MulticellReorderAlgorithm.java
+6 -6
View File
@@ -38,8 +38,8 @@ public class MulticellReorderAlgorithm extends ReorderAlgorithm {
mSeam = new View(cellLayout.getContext());
}
private CellLayout.ItemConfiguration removeSeamFromSolution(
CellLayout.ItemConfiguration solution) {
private ItemConfiguration removeSeamFromSolution(
ItemConfiguration solution) {
solution.map.forEach((view, cell) -> cell.cellX =
cell.cellX > mCellLayout.getCountX() / 2 ? cell.cellX - 1 : cell.cellX);
solution.cellX =
@@ -48,7 +48,7 @@ public class MulticellReorderAlgorithm extends ReorderAlgorithm {
}
@Override
public CellLayout.ItemConfiguration closestEmptySpaceReorder(int pixelX, int pixelY,
public ItemConfiguration closestEmptySpaceReorder(int pixelX, int pixelY,
int minSpanX, int minSpanY,
int spanX, int spanY) {
return removeSeamFromSolution(simulateSeam(
@@ -57,16 +57,16 @@ public class MulticellReorderAlgorithm extends ReorderAlgorithm {
}
@Override
public CellLayout.ItemConfiguration findReorderSolution(int pixelX, int pixelY, int minSpanX,
public ItemConfiguration findReorderSolution(int pixelX, int pixelY, int minSpanX,
int minSpanY, int spanX, int spanY, int[] direction, View dragView, boolean decX,
CellLayout.ItemConfiguration solution) {
ItemConfiguration solution) {
return removeSeamFromSolution(simulateSeam(
() -> super.findReorderSolution(pixelX, pixelY, minSpanX, minSpanY, spanX, spanY,
direction, dragView, decX, solution)));
}
@Override
public CellLayout.ItemConfiguration dropInPlaceSolution(int pixelX, int pixelY, int spanX,
public ItemConfiguration dropInPlaceSolution(int pixelX, int pixelY, int spanX,
int spanY,
View dragView) {
return removeSeamFromSolution(simulateSeam(