Changing isExternalDragWidget to isDragWidget as workspace goes to

modal state even when dragging from workspace

Bug: 29900481
Change-Id: I60ce6073b1c06ed19c75a341f9b73f6a147be889
This commit is contained in:
Sunny Goyal
2016-07-07 15:24:44 -07:00
parent b20cbb25df
commit e49a97aba0

View File

@@ -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();
}