Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 464562ae authored by Stefan Andonian's avatar Stefan Andonian Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Id78da045bec6c06f0a06aee95a2881c6f9dacd58
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ae228852 bae4a72d

src/com/android/launcher3/Workspace.java

+6 −0
Original line number Diff line number Diff line
@@ -2775,6 +2775,12 @@ public class Workspace extends PagedView<WorkspacePageIndicator> 
                        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());