diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-04-05 16:38:39 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-04-07 12:21:26 -0700 |
commit | 1ab22630a0c1e16873eb49d0021e0f3dbec4b0ba (patch) | |
tree | da7a2da8d790e6dcf4e1a9a1f6288106a87a7c85 /src/com/android/launcher3/model | |
parent | b8b070c2dfb27d9ba168c45dd5503e89035a1139 (diff) | |
download | android_packages_apps_Trebuchet-1ab22630a0c1e16873eb49d0021e0f3dbec4b0ba.tar.gz android_packages_apps_Trebuchet-1ab22630a0c1e16873eb49d0021e0f3dbec4b0ba.tar.bz2 android_packages_apps_Trebuchet-1ab22630a0c1e16873eb49d0021e0f3dbec4b0ba.zip |
Fixing wrong grid size definitions
Bug: 27958565
Change-Id: Icabc651552bbf6483fedbaeb52745c48d418f9ea
Diffstat (limited to 'src/com/android/launcher3/model')
-rw-r--r-- | src/com/android/launcher3/model/GridSizeMigrationTask.java | 8 |
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 931466c3b..e0547343e 100644 --- a/src/com/android/launcher3/model/GridSizeMigrationTask.java +++ b/src/com/android/launcher3/model/GridSizeMigrationTask.java @@ -958,13 +958,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)); |