commit c7da555dc5b252042dff0a6920efb1bfeb4a0c9a
author Winson Chung <winsonc@google.com> Wed Aug 10 15:28:45 2011 -0700
committer Winson Chung <winsonc@google.com> Wed Aug 10 15:29:55 2011 -0700
tree 124c972e4c4b9780dfde0263b0856dcf50c96b36
parent fa2b241424f3478200e77d61db83448c2f211fee

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

Change-Id: Ibea34ecb17601c90c7a8f2c96abedff6c00dc4d9

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 1b105d2..b260ae3 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -478,8 +478,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 ce3aad4..ede08cc 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -2809,8 +2809,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