Merge "Fixing problems in spring loaded mode and adding shortcut to hotseat. (5144911, 5144663)"

This commit is contained in:
Winson Chung authored and Android (Google) Code Review committed 2011-08-11 13:42:58 -07:00
commit 981b8a3708
2 files changed
+2 -4

No files matched your search

+1 -2
View File
@@ -2819,8 +2819,7 @@ public class Workspace extends SmoothPagedView
}
}
if (layout == null) {
layout = findMatchingPageForDragOver(d.dragView, mDragViewVisualCenter[0],
mDragViewVisualCenter[1], true);
layout = findMatchingPageForDragOver(d.dragView, d.x, d.y, true);
}
if (layout != mDragTargetLayout) {
// Cancel all intermediate folder states