diff options
| author | Federico Baron <fbaron@google.com> | 2023-07-17 17:58:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-07-17 17:58:50 +0000 |
| commit | 96e03b3edfd417c018eadea754643af4300c23d8 (patch) | |
| tree | 47847a77175ade1ef9b095dd3f6f1f6c68d4b442 /src/com/android | |
| parent | add37239db821470829a7c68a5f129bc7ce2c9c7 (diff) | |
| parent | 8002897694438eed4e311cba84b866035674463e (diff) | |
| download | Launcher3-96e03b3edfd417c018eadea754643af4300c23d8.tar.gz | |
Merge "Fix inability to remove or interact with folder when removing 2nd item from folder" into udc-dev am: 8002897694
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24056558
Change-Id: Iff6b9ec51905ae3c724eed52f3ecedb7a547efeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/folder/LauncherDelegate.java | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index ce8d25a12c..8fb68f1bf6 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2187,6 +2187,8 @@ public class Launcher extends StatefulActivity<LauncherState> /** * Returns the CellLayout of the specified container at the specified screen. + * + * @param screenId must be presenterPos and not modelPos. */ public CellLayout getCellLayout(int container, int screenId) { return (container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) diff --git a/src/com/android/launcher3/folder/LauncherDelegate.java b/src/com/android/launcher3/folder/LauncherDelegate.java index f15dc83387..7ac2472319 100644 --- a/src/com/android/launcher3/folder/LauncherDelegate.java +++ b/src/com/android/launcher3/folder/LauncherDelegate.java @@ -93,7 +93,7 @@ public class LauncherDelegate { // Move the item from the folder to the workspace, in the position of the // folder CellLayout cellLayout = mLauncher.getCellLayout(info.container, - info.screenId); + mLauncher.getCellPosMapper().mapModelToPresenter(info).screenId); if (cellLayout == null) { return; } |