From e49a97aba08ac5a5a3de2c09cc2ae027a13f7d75 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Thu, 7 Jul 2016 15:24:44 -0700 Subject: [PATCH] Changing isExternalDragWidget to isDragWidget as workspace goes to modal state even when dragging from workspace Bug: 29900481 Change-Id: I60ce6073b1c06ed19c75a341f9b73f6a147be889 --- src/com/android/launcher3/Workspace.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index f71aaef032..dd54495722 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -3177,9 +3177,6 @@ public class Workspace extends PagedView return (d.dragInfo instanceof LauncherAppWidgetInfo || d.dragInfo instanceof PendingAddWidgetInfo); } - private boolean isExternalDragWidget(DragObject d) { - return d.dragSource != this && isDragWidget(d); - } public void onDragOver(DragObject d) { // Skip drag over events while we are dragging over side pages @@ -3201,7 +3198,7 @@ public class Workspace extends PagedView final View child = (mDragInfo == null) ? null : mDragInfo.cell; // Identify whether we have dragged over a side page if (workspaceInModalState()) { - if (mLauncher.getHotseat() != null && !isExternalDragWidget(d)) { + if (mLauncher.getHotseat() != null && !isDragWidget(d)) { if (isPointInSelfOverHotseat(d.x, d.y)) { layout = mLauncher.getHotseat().getLayout(); }