commit 981b8a3708f7c8de5ab8f896c4ea8110379c012a
author Winson Chung <winsonc@google.com> Thu Aug 11 13:42:58 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 11 13:42:58 2011 -0700
tree 80ba75aeef195e721871e9a2000d0f52029d26e5
parent c57b7a8233d32c6dd8de5057c570afe3f50e3ef2
parent c7da555dc5b252042dff0a6920efb1bfeb4a0c9a

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

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index b1f56d0..0f074ac 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -483,8 +483,7 @@
 
         // 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;

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 9856f7e..e2fcfec 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -2819,8 +2819,7 @@
                 }
             }
             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