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

Commit 8f3285c1 authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Fix bug where dragging app from Search breaks Folder preview." into... 

Merge "Fix bug where dragging app from Search breaks Folder preview." into ub-launcher3-dorval-polish2
parents bb28c01c 4f59381b

src/com/android/launcher3/folder/FolderIcon.java

+4 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ import com.android.launcher3.Workspace; 
import com.android.launcher3.badge.BadgeRenderer;

import com.android.launcher3.badge.FolderBadgeInfo;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.dragndrop.BaseItemDragListener;

import com.android.launcher3.dragndrop.DragLayer;

import com.android.launcher3.dragndrop.DragView;

import com.android.launcher3.graphics.IconPalette;
@@ -375,6 +376,9 @@ public class FolderIcon extends FrameLayout implements FolderListener { 
        if (d.dragInfo instanceof AppInfo) {

            // Came from all apps -- make a copy

            item = ((AppInfo) d.dragInfo).makeShortcut();

        } else if (d.dragSource instanceof BaseItemDragListener){

            // Came from a different window -- make a copy

            item = new ShortcutInfo((ShortcutInfo) d.dragInfo);

        } else {

            item = (ShortcutInfo) d.dragInfo;

        }