| commit | 85403363b040aa0dc647cc86c17dbb7c62175e0e | [log] [tgz] |
|---|---|---|
| author | Alex Chau <alexchau@google.com> | Mon May 09 14:19:59 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 09 14:19:59 2022 +0000 |
| tree | 0cc763ea270d332a9dcb66270707354d380d9037 | |
| parent | 0d37d70e21e7111d3fdadd6f0a2e426b15c66831 [diff] | |
| parent | d9b6543a04d4fbea5caa8ff0fecb7de55928af79 [diff] |
Merge "Sort hotseat items in migration to preserve position" into tm-dev am: d9b6543a04 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18185509 Change-Id: I52e194d02284f619df1a9617078282c6690bb07c 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<>();