commit c11a808b998bef193ff62cef1498eded5997e602
author Tracy Zhou <tracyzhou@google.com> Wed Jun 10 17:21:16 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 10 17:21:16 2020 +0000
tree 4435481957d05f7b46c182485ac6b1007203b6af
parent 4e975109bbbb954ee7789d2af4308040e535dc61
parent 51e33e187b08eb646a99a5a2fdc9b3b92c8724fc

Merge "Workspace migration should start from CellY = 1" into ub-launcher3-rvc-dev

src/com/android/launcher3/model/GridSizeMigrationTaskV2.java

diff --git a/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java b/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java
index a5d798b..5ba2c8e 100644
--- a/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java
+++ b/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java
@@ -384,7 +384,7 @@
          * to speed up the search.
          */
         private boolean findPlacement(DbEntry entry) {
-            for (int y = mNextStartY; y >= 0; y--) {
+            for (int y = mNextStartY; y > 0; y--) {
                 for (int x = mNextStartX; x < mTrgX; x++) {
                     boolean fits = mOccupied.isRegionVacant(x, y, entry.spanX, entry.spanY);
                     boolean minFits = mOccupied.isRegionVacant(x, y, entry.minSpanX,