summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPatrick Dubroy <dubroy@google.com>2011-01-14 19:02:44 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-14 19:02:44 -0800
commit1619ccfce4d7117144db27e5e08ef3a3d4b339a7 (patch)
tree8cc0794e5bb2f270dbe4df1ba29846ffd5033c21 /src
parentd63497bb62138dc70ef06d50133354c881c45d34 (diff)
parent0c10bb4a56a8dd06e4ddd9830bd279fdaf4a8df7 (diff)
downloadpackages_apps_trebuchet-1619ccfce4d7117144db27e5e08ef3a3d4b339a7.zip
packages_apps_trebuchet-1619ccfce4d7117144db27e5e08ef3a3d4b339a7.tar.gz
packages_apps_trebuchet-1619ccfce4d7117144db27e5e08ef3a3d4b339a7.tar.bz2
Merge "Fix 3300849: Illegal state exception during dragging." into honeycomb
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/Workspace.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 8e0308c..3f3088f 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -1622,10 +1622,8 @@ public class Workspace extends SmoothPagedView
}
mDragInfo = cellInfo;
- mDragInfo.screen = mCurrentPage;
-
- CellLayout current = getCurrentDropLayout();
+ CellLayout current = (CellLayout) getChildAt(cellInfo.screen);
current.onDragChild(child);
child.clearFocus();