diff options
| author | Winson Chung <winsonc@google.com> | 2013-07-31 17:31:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-31 17:31:17 +0000 |
| commit | 08ab8d28c659436966fd4afefb408dd0116ea6ff (patch) | |
| tree | ed1b7a0d58e45f84404e3ff22667566de9e70f2a /src/com/android/launcher3 | |
| parent | df11a77f291b1fd6d1f9358c0a42d0621737d15a (diff) | |
| parent | 9883c9ae25a60b0be12f66f624a7eeff6781c175 (diff) | |
| download | android_packages_apps_Trebuchet-08ab8d28c659436966fd4afefb408dd0116ea6ff.tar.gz android_packages_apps_Trebuchet-08ab8d28c659436966fd4afefb408dd0116ea6ff.tar.bz2 android_packages_apps_Trebuchet-08ab8d28c659436966fd4afefb408dd0116ea6ff.zip | |
Merge "Prevent dragging workspace items to custom content page." into jb-ub-gel-agar
Diffstat (limited to 'src/com/android/launcher3')
| -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 e590779df..75bf26986 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -3705,6 +3705,11 @@ public class Workspace extends SmoothPagedView final int page = getNextPage() + (direction == DragController.SCROLL_LEFT ? -1 : 1); + // Ensure that we are not dragging over to the custom content screen + if (getScreenIdForPageIndex(page) == CUSTOM_CONTENT_SCREEN_ID) { + return false; + } + // We always want to exit the current layout to ensure parity of enter / exit setCurrentDropLayout(null); |