commit 5f53ea65c4e376a6e12e14ece8ed70b559048fa0
author Tracy Zhou <tracyzhou@google.com> Wed Jun 10 17:26:05 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 10 17:26:05 2020 +0000
tree f048dab47959a64e2fb5ab52ed6f3629b83b3ed4
parent 71eb5a54ea0f200756372fc4f21dbd752606a478
parent c11a808b998bef193ff62cef1498eded5997e602

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11821039

Change-Id: I598c5fdafc54caac11b82162e6aba2ac291c3469

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,