commit e49a97aba08ac5a5a3de2c09cc2ae027a13f7d75
author Sunny Goyal <sunnygoyal@google.com> Thu Jul 07 15:24:44 2016 -0700
committer Sunny Goyal <sunnygoyal@google.com> Thu Jul 07 15:28:07 2016 -0700
tree 5d07290a63995439d1c4a38c8d1b4ea87748bc28
parent b20cbb25dfd4c58b172787185517c79808a7e5d9

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

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index f71aaef..dd54495 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -3177,9 +3177,6 @@
         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 @@
         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();
                 }