From c7da555dc5b252042dff0a6920efb1bfeb4a0c9a Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Wed, 10 Aug 2011 15:28:45 -0700 Subject: [PATCH] Fixing problems in spring loaded mode and adding shortcut to hotseat. (5144911, 5144663) Change-Id: Ibea34ecb17601c90c7a8f2c96abedff6c00dc4d9 --- src/com/android/launcher2/Launcher.java | 3 +-- src/com/android/launcher2/Workspace.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 1b105d23a4..b260ae3eda 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -478,8 +478,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 ce3aad4fb0..ede08ccb7e 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -2809,8 +2809,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