Fixing wrong layout used to calculate drag-n-drop location

Bug: 119229781
Bug: 119234125
Change-Id: I24425a7754db3dfef803088761fa67c9586d89d9
This commit is contained in:
Sunny Goyal 2018-11-08 11:10:20 -08:00
parent 160bfcfede
commit 024659c1b0
1 changed files with 3 additions and 3 deletions

View File

@ -1625,7 +1625,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
mDragViewVisualCenter = d.getVisualCenter(mDragViewVisualCenter);
// We want the point to be mapped to the dragTarget.
mapPointFromDropLayout(mLauncher.getHotseat(), mDragViewVisualCenter);
mapPointFromDropLayout(dropTargetLayout, mDragViewVisualCenter);
int spanX;
int spanY;
@ -1827,7 +1827,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
// We want the point to be mapped to the dragTarget.
if (dropTargetLayout != null) {
mapPointFromDropLayout(mLauncher.getHotseat(), mDragViewVisualCenter);
mapPointFromDropLayout(dropTargetLayout, mDragViewVisualCenter);
}
boolean droppedOnOriginalCell = false;
@ -2255,7 +2255,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
// Handle the drag over
if (mDragTargetLayout != null) {
// We want the point to be mapped to the dragTarget.
mapPointFromDropLayout(mLauncher.getHotseat(), mDragViewVisualCenter);
mapPointFromDropLayout(mDragTargetLayout, mDragViewVisualCenter);
int minSpanX = item.spanX;
int minSpanY = item.spanY;