diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-09-22 19:34:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-22 19:34:40 +0000 |
| commit | e67ccac004416d78d37968f60fe68f3bac6d33c1 (patch) | |
| tree | edaea1d533ee5437a70749b9cb5eaf0c67c8307f /src | |
| parent | 49ff36f1f12be127034ee59a27ed80e35cf36117 (diff) | |
| parent | df041bc7ad99a6d33a5dd83a5dff28a617fedf12 (diff) | |
| download | android_packages_apps_Trebuchet-e67ccac004416d78d37968f60fe68f3bac6d33c1.tar.gz android_packages_apps_Trebuchet-e67ccac004416d78d37968f60fe68f3bac6d33c1.tar.bz2 android_packages_apps_Trebuchet-e67ccac004416d78d37968f60fe68f3bac6d33c1.zip | |
Merge "Fix issue where you could page to -1 during spring loaded drag (issue 10640529)" into jb-ub-now-indigo-rose
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 67d66f4c3..8cf2c41f6 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2950,6 +2950,11 @@ public class Workspace extends SmoothPagedView float smallestDistSoFar = Float.MAX_VALUE; for (int i = 0; i < screenCount; i++) { + // The custom content screen is not a valid drag over option + if (mScreenOrder.get(i) == CUSTOM_CONTENT_SCREEN_ID) { + continue; + } + CellLayout cl = (CellLayout) getChildAt(i); final float[] touchXy = {originX, originY}; |