From c487b365194f36351e15bcfa98b775b074eac678 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Fri, 13 Jul 2018 17:03:34 +0000 Subject: [PATCH] Revert "Create new ShortcutInfo when dropping predicted deep shortcuts." This reverts commit 4685965355577c3d08f3d9f4bd4d9cdff1245679. Reason for revert: Bug: 111435256 Change-Id: I4baf35dcc944915acad9b62d6e36a6858f89af85 --- src/com/android/launcher3/Workspace.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 11523a516f..0b117075a7 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2716,16 +2716,10 @@ public class Workspace extends PagedView case LauncherSettings.Favorites.ITEM_TYPE_APPLICATION: case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT: case LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT: - if (info.container == NO_ID) { + if (info.container == NO_ID && info instanceof AppInfo) { // 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; - } - + info = ((AppInfo) info).makeShortcut(); + d.dragInfo = info; } view = mLauncher.createShortcut(cellLayout, (ShortcutInfo) info); break;