diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-09-22 12:32:22 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2013-09-22 12:33:36 -0700 |
| commit | df041bc7ad99a6d33a5dd83a5dff28a617fedf12 (patch) | |
| tree | 4a2563899f2b9da1f854fee1e4b2c8af97d8d15e /src | |
| parent | 89f9705077c054b541af7da52be832760e2ae2e8 (diff) | |
| download | android_packages_apps_Trebuchet-df041bc7ad99a6d33a5dd83a5dff28a617fedf12.tar.gz android_packages_apps_Trebuchet-df041bc7ad99a6d33a5dd83a5dff28a617fedf12.tar.bz2 android_packages_apps_Trebuchet-df041bc7ad99a6d33a5dd83a5dff28a617fedf12.zip | |
Fix issue where you could page to -1 during spring loaded drag (issue 10640529)
Change-Id: I487c871af4ec4412ee4edc74ce58947e54ccd43b
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 4dca5997a..9dfe18ba2 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2951,6 +2951,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}; |