| commit | 86c6d714eff73518dfd69af365371ad76ae67d79 | [log] [tgz] |
|---|---|---|
| author | Alex Chau <alexchau@google.com> | Mon May 09 15:13:59 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 09 15:13:59 2022 +0000 |
| tree | 6f50beedd1bd0552d406d9af448545b261c2bca2 | |
| parent | 891694abd4b87d5201bf3f13c35edead387a52ee [diff] | |
| parent | 85403363b040aa0dc647cc86c17dbb7c62175e0e [diff] |
Merge "Sort hotseat items in migration to preserve position" into tm-dev am: d9b6543a04 am: 85403363b0 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18185509 Change-Id: Ie1e47381e84267bc10cfdc99683d328684196687 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java b/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java index e36d4cf..ef9250c 100644 --- a/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java +++ b/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java
@@ -216,14 +216,15 @@ return false; } + // Sort the items by the reading order. + Collections.sort(mHotseatDiff); + Collections.sort(mWorkspaceDiff); + // Migrate hotseat HotseatPlacementSolution hotseatSolution = new HotseatPlacementSolution(mDb, mSrcReader, mDestReader, mContext, mDestHotseatSize, mHotseatItems, mHotseatDiff); hotseatSolution.find(); - // Sort the items by the reading order. - Collections.sort(mWorkspaceDiff); - // Migrate workspace. // First we create a collection of the screens List<Integer> screens = new ArrayList<>();