commit 12c99080a47729a8bb4cc691629c46abffeec75a
author Stefan Andonian <andonian@google.com> Mon Apr 04 20:30:55 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Apr 04 20:30:55 2022 +0000
tree c9472c1852b7c97ba3cf4846286a725ab1ed0639
parent 3eed932247ab54554d67fa995a4615f50c7a419d
parent bae4a72d30dc9e916600e34c3725cda74581ea5c

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

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

Change-Id: I817b96d3c7fd4ffaa139f30122def836e00e37d1
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());