summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2016-04-05 16:38:39 -0700
committerSunny Goyal <sunnygoyal@google.com>2016-04-13 17:36:45 +0000
commitddd6d96d5fc688765774dc2f4d8baebc407e31c7 (patch)
tree314ac9d53a5e9e266a8a15c9e448cd2955878625
parent4e04695cdef2438628eb443b2182c51ac8185a35 (diff)
downloadLauncher3-ddd6d96d5fc688765774dc2f4d8baebc407e31c7.tar.gz
Fixing wrong grid size definitions
Bug: 27958565 Change-Id: Icabc651552bbf6483fedbaeb52745c48d418f9ea (cherry picked from commit 1ab22630a0c1e16873eb49d0021e0f3dbec4b0ba)
-rw-r--r--src/com/android/launcher3/model/GridSizeMigrationTask.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/launcher3/model/GridSizeMigrationTask.java b/src/com/android/launcher3/model/GridSizeMigrationTask.java
index 9cab25a5ef..8117122055 100644
--- a/src/com/android/launcher3/model/GridSizeMigrationTask.java
+++ b/src/com/android/launcher3/model/GridSizeMigrationTask.java
@@ -954,13 +954,15 @@ public class GridSizeMigrationTask {
// 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));