diff options
| author | Winson Chung <winsonc@google.com> | 2011-08-11 13:42:58 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-11 13:42:58 -0700 |
| commit | 981b8a3708f7c8de5ab8f896c4ea8110379c012a (patch) | |
| tree | 80ba75aeef195e721871e9a2000d0f52029d26e5 /src | |
| parent | c57b7a8233d32c6dd8de5057c570afe3f50e3ef2 (diff) | |
| parent | c7da555dc5b252042dff0a6920efb1bfeb4a0c9a (diff) | |
| download | android_packages_apps_Trebuchet-981b8a3708f7c8de5ab8f896c4ea8110379c012a.tar.gz android_packages_apps_Trebuchet-981b8a3708f7c8de5ab8f896c4ea8110379c012a.tar.bz2 android_packages_apps_Trebuchet-981b8a3708f7c8de5ab8f896c4ea8110379c012a.zip | |
Merge "Fixing problems in spring loaded mode and adding shortcut to hotseat. (5144911, 5144663)"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 3 | ||||
| -rw-r--r-- | 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 b1f56d064..0f074ac06 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 9856f7e16..e2fcfecf4 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 |