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

Commit 46859653 authored by Jon Miranda's avatar Jon Miranda
Browse files

Create new ShortcutInfo when dropping predicted deep shortcuts. 

We were modifying the ShortcutInfo for the predicted app in All Apps,
so we would display "Remove" instead of "Cancel" because the item
was given an id.

Bug: 73377438
Change-Id: I1b9788bbf089d304a2868de866c78932fececed9
parent 5f72d3b8

src/com/android/launcher3/Workspace.java

+9 −3
Original line number Diff line number Diff line
@@ -2716,10 +2716,16 @@ public class Workspace extends PagedView<WorkspacePageIndicator> 
            case LauncherSettings.Favorites.ITEM_TYPE_APPLICATION:

            case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT:

            case LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT:

                if (info.container == NO_ID && info instanceof AppInfo) {

                if (info.container == NO_ID) {

                    // Came from all apps -- make a copy

                    if (info instanceof AppInfo) {

                        info = ((AppInfo) info).makeShortcut();

                        d.dragInfo = info;

                    } else if (info instanceof ShortcutInfo) {

                        info = new ShortcutInfo((ShortcutInfo) info);

                        d.dragInfo = info;

                    }



                }

                view = mLauncher.createShortcut(cellLayout, (ShortcutInfo) info);

                break;