| commit | 89d4949311236ce450c6fd3f622f8e6fb69f5a11 | [log] [tgz] |
|---|---|---|
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Tue Jul 18 16:49:52 2023 +0000 |
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Tue Jul 18 16:49:52 2023 +0000 |
| tree | 2d9b07e3ce24d245120245d9d08b8e55d782419f | |
| parent | 16d8dff2384d6195c29adc0e1fe442a177be407b [diff] | |
| parent | 8a18bc0f12fc14e69f0e5398488cf989c99cbb49 [diff] |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24056558'] into sparse-10502572-L39700000962039696. SPARSE_CHANGE: I26138ee9f8e7cdb45cafe2446dc4d1e3d6d8347f Change-Id: I38720247bf3f5ca08e59bcc570558e456c88c411
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 25eb160..6669043 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java
@@ -2194,6 +2194,8 @@ /** * 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 f15dc83..7ac2472 100644 --- a/src/com/android/launcher3/folder/LauncherDelegate.java +++ b/src/com/android/launcher3/folder/LauncherDelegate.java
@@ -93,7 +93,7 @@ // 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; }