commit d18b80656f764b4840189a6f25467a4c0c439388
author Stefan Andonian <andonian@google.com> Mon Apr 04 20:25:38 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Apr 04 20:25:38 2022 +0000
tree 59a4b2a1651fbd80fcbba6f49ed3cea3df057bc3
parent 481668db31435b3642e1d9c82d85123ca0f9a8e3
parent 464562ae8a07daa425d5dfd9e533b9e4dae76d11

Merge "Show correct drop targets for All-apps predicted item drags." into tm-dev am: bae4a72d30 am: 464562ae8a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17513162

Change-Id: Id6deadd559b6faa146790580ac8a83568ec0c5ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 635b7cc..6a136d4 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2775,6 +2775,12 @@
                         info = ((AppInfo) info).makeWorkspaceItem();
                         d.dragInfo = info;
                     }
+                    if (info instanceof WorkspaceItemInfo
+                            && info.container == LauncherSettings.Favorites.CONTAINER_PREDICTION) {
+                        // Came from all apps prediction row -- make a copy
+                        info = new WorkspaceItemInfo((WorkspaceItemInfo) info);
+                        d.dragInfo = info;
+                    }
                     if (info instanceof SearchActionItemInfo) {
                         info = ((SearchActionItemInfo) info).createWorkspaceItem(
                                 mLauncher.getModel());