aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 19:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Moving classes inside of CellLayout to their own file" into main

Browse Source
This commit is contained in:
Sebastián Franco
2023-11-24 01:27:13 +00:00
committed by Android (Google) Code Review
parent 3e43b8a996 5f0af4f633
commit 525b0343f8
13 changed files with 362 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/src/com/android/launcher3/celllayout/ReorderAlgorithmUnitTest.java
View File

@@ -108,7 +108,7 @@ public class ReorderAlgorithmUnitTest {
};
}
public CellLayout.ItemConfiguration solve(CellLayoutBoard board, int x, int y, int spanX,
public ItemConfiguration solve(CellLayoutBoard board, int x, int y, int spanX,
int spanY, int minSpanX, int minSpanY) {
CellLayout cl = createCellLayout(board.getWidth(), board.getHeight());
@@ -126,17 +126,17 @@ public class ReorderAlgorithmUnitTest {
int[] testCaseXYinPixels = new int[2];
cl.regionToCenterPoint(x, y, spanX, spanY, testCaseXYinPixels);
CellLayout.ItemConfiguration solution = cl.createReorderAlgorithm().calculateReorder(
ItemConfiguration solution = cl.createReorderAlgorithm().calculateReorder(
testCaseXYinPixels[0], testCaseXYinPixels[1], minSpanX, minSpanY, spanX, spanY,
null);
if (solution == null) {
solution = new CellLayout.ItemConfiguration();
solution = new ItemConfiguration();
solution.isSolution = false;
}
return solution;
}
public CellLayoutBoard boardFromSolution(CellLayout.ItemConfiguration solution, int width,
public CellLayoutBoard boardFromSolution(ItemConfiguration solution, int width,
int height) {
// Update the views with solution value
solution.map.forEach((key, val) -> key.setLayoutParams(
@@ -149,7 +149,7 @@ public class ReorderAlgorithmUnitTest {
}
public void evaluateTestCase(ReorderAlgorithmUnitTestCase testCase) {
CellLayout.ItemConfiguration solution = solve(testCase.startBoard, testCase.x,
ItemConfiguration solution = solve(testCase.startBoard, testCase.x,
testCase.y, testCase.spanX, testCase.spanY, testCase.minSpanX,
testCase.minSpanY);
assertEquals("should be a valid solution", solution.isSolution,
@@ -200,7 +200,7 @@ public class ReorderAlgorithmUnitTest {
CellLayoutBoard board = generateBoard(new CellLayoutBoard(width, height),
new Rect(0, 0, width, height), targetWidth * targetHeight);
CellLayout.ItemConfiguration solution = solve(board, x, y, targetWidth, targetHeight,
ItemConfiguration solution = solve(board, x, y, targetWidth, targetHeight,
minTargetWidth, minTargetHeight);
CellLayoutBoard finishBoard = solution.isSolution ? boardFromSolution(solution,