diff options
author | Federico Baron <fbaron@google.com> | 2023-07-17 17:11:26 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-07-17 17:11:26 +0000 |
commit | 8002897694438eed4e311cba84b866035674463e (patch) | |
tree | 1e7ae6603f21e0d7a070a7b3fdc3721aaf9e16a7 | |
parent | be4a43c1d9f8796a2f96bdbac0bccd2d8f9e79e8 (diff) | |
parent | 326ec97ab6a4d348708830cd2860d4dd90a59039 (diff) | |
download | Launcher3-8002897694438eed4e311cba84b866035674463e.tar.gz |
Merge "Fix inability to remove or interact with folder when removing 2nd item from folder" into udc-dev
-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 25eb16079f..66690431ec 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2194,6 +2194,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; } |