From 10923b30a22b4ec8d10cf8536bddf3f176e6c26f Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Wed, 20 Jul 2016 15:42:44 -0700 Subject: Removing shadow and badging from the icon which is shown in the menu These are added as soon as the icon is added to the workspace Bug: 28980830 Change-Id: I725d2ee8994324f09d9ecf7bbbb0090a7ceb5769 --- src/com/android/launcher3/Workspace.java | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/com/android/launcher3/Workspace.java') diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 946c306d6..4ed2467eb 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2301,11 +2301,19 @@ public class Workspace extends PagedView } public void beginDragShared(View child, DragSource source, boolean accessible) { - beginDragShared(child, new Point(), source, accessible, new DragPreviewProvider(child)); + Object dragObject = child.getTag(); + if (!(dragObject instanceof ItemInfo)) { + String msg = "Drag started with a view that has no tag set. This " + + "will cause a crash (issue 11627249) down the line. " + + "View: " + child + " tag: " + child.getTag(); + throw new IllegalStateException(msg); + } + beginDragShared(child, new Point(), source, accessible, + (ItemInfo) dragObject, new DragPreviewProvider(child)); } public void beginDragShared(View child, Point relativeTouchPos, DragSource source, - boolean accessible, DragPreviewProvider previewProvider) { + boolean accessible, ItemInfo dragObject, DragPreviewProvider previewProvider) { child.clearFocus(); child.setPressed(false); @@ -2362,20 +2370,12 @@ public class Workspace extends PagedView icon.clearPressedBackground(); } - Object dragObject = child.getTag(); - if (!(dragObject instanceof ItemInfo)) { - String msg = "Drag started with a view that has no tag set. This " - + "will cause a crash (issue 11627249) down the line. " - + "View: " + child + " tag: " + child.getTag(); - throw new IllegalStateException(msg); - } - if (child.getParent() instanceof ShortcutAndWidgetContainer) { mDragSourceInternal = (ShortcutAndWidgetContainer) child.getParent(); } DragView dv = mDragController.startDrag(b, dragLayerX, dragLayerY, source, - (ItemInfo) dragObject, DragController.DRAG_ACTION_MOVE, dragVisualizeOffset, + dragObject, DragController.DRAG_ACTION_MOVE, dragVisualizeOffset, dragRect, scale, accessible); dv.setIntrinsicIconScaleFactor(source.getIntrinsicIconScaleFactor()); -- cgit v1.2.3