Fixing wrong grid size definitions
am: 1ab2263
* commit '1ab22630a0c1e16873eb49d0021e0f3dbec4b0ba':
Fixing wrong grid size definitions
Change-Id: Iab0288528ec4bea2bc332315b85dc04dddd8f051
diff --git a/src/com/android/launcher3/model/GridSizeMigrationTask.java b/src/com/android/launcher3/model/GridSizeMigrationTask.java
index 931466c..e054734 100644
--- a/src/com/android/launcher3/model/GridSizeMigrationTask.java
+++ b/src/com/android/launcher3/model/GridSizeMigrationTask.java
@@ -958,13 +958,15 @@
// The following list defines all possible grid sizes (and intermediate steps
// during migration). Note that at each step, dx <= 1 && dy <= 1. Any grid size
// which is not in this list is not migrated.
+ // Note that the InvariantDeviceProfile defines (rows, cols) but the Points
+ // specified here are defined as (cols, rows).
ArrayList<Point> gridSizeSteps = new ArrayList<>();
- gridSizeSteps.add(new Point(2, 3));
+ gridSizeSteps.add(new Point(3, 2));
gridSizeSteps.add(new Point(3, 3));
- gridSizeSteps.add(new Point(3, 4));
+ gridSizeSteps.add(new Point(4, 3));
gridSizeSteps.add(new Point(4, 4));
gridSizeSteps.add(new Point(5, 5));
- gridSizeSteps.add(new Point(5, 6));
+ gridSizeSteps.add(new Point(6, 5));
gridSizeSteps.add(new Point(6, 6));
gridSizeSteps.add(new Point(7, 7));