summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Workspace.java
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2013-07-12 22:16:03 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-07-12 22:16:03 +0000
commitb5da44583957ffe9b0311074eeb77d33e753a9e5 (patch)
tree63bccce2e816e01cbfd764c6f7cf6d92769386e6 /src/com/android/launcher3/Workspace.java
parent1ebead458549fadf353787105f15c02290cccee6 (diff)
parent156ab5b22e45b36a1c5edbe5accccf6aefcb4907 (diff)
downloadandroid_packages_apps_Trebuchet-b5da44583957ffe9b0311074eeb77d33e753a9e5.tar.gz
android_packages_apps_Trebuchet-b5da44583957ffe9b0311074eeb77d33e753a9e5.tar.bz2
android_packages_apps_Trebuchet-b5da44583957ffe9b0311074eeb77d33e753a9e5.zip
Merge "Fixing issue where migration all apps folder couldn't be picked up." into jb-ub-gel-agar
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
-rw-r--r--src/com/android/launcher3/Workspace.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 2ab4bbd93..d9582adfb 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2725,9 +2725,7 @@ public class Workspace extends SmoothPagedView
mTempPt[0] = (int) xy[0];
mTempPt[1] = (int) xy[1];
mLauncher.getDragLayer().getDescendantCoordRelativeToSelf(this, mTempPt, true);
-
- mTempPt[0] -= hotseat.getLeft();
- mTempPt[1] -= hotseat.getTop();
+ mLauncher.getDragLayer().mapCoordInSelfToDescendent(hotseat.getLayout(), mTempPt);
xy[0] = mTempPt[0];
xy[1] = mTempPt[1];