Merge "Show correct drop targets for All-apps predicted item drags." into tm-dev am: bae4a72d30 am: 464562ae8a am: d18b80656f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17513162 Change-Id: I69f2c9e760f993b3489eb2841da7241df4be2e5d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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());
|
||||
|
||||
Reference in New Issue
Block a user