diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index b1f56d064d..0f074ac061 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -483,8 +483,7 @@ public final class Launcher extends Activity // For example, the user would PICK_SHORTCUT for "Music playlist", and we // launch over to the Music app to actually CREATE_SHORTCUT. - if (resultCode == RESULT_OK && mPendingAddInfo.container != ItemInfo.NO_ID && - mPendingAddInfo.screen > -1) { + if (resultCode == RESULT_OK && mPendingAddInfo.container != ItemInfo.NO_ID) { final PendingAddArguments args = new PendingAddArguments(); args.requestCode = requestCode; args.intent = data; diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 9856f7e16b..e2fcfecf41 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -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