diff options
| author | Winson Chung <winsonc@google.com> | 2013-07-26 13:50:47 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2013-07-26 13:50:47 -0700 |
| commit | 9883c9ae25a60b0be12f66f624a7eeff6781c175 (patch) | |
| tree | 56a53661b8cfe5fd6945655a5fb7bb1e8ceb33a4 /src | |
| parent | bffe745b1e195deedc1dcc60f37950b3b0b4c652 (diff) | |
| download | android_packages_apps_Trebuchet-9883c9ae25a60b0be12f66f624a7eeff6781c175.tar.gz android_packages_apps_Trebuchet-9883c9ae25a60b0be12f66f624a7eeff6781c175.tar.bz2 android_packages_apps_Trebuchet-9883c9ae25a60b0be12f66f624a7eeff6781c175.zip | |
Prevent dragging workspace items to custom content page.
Change-Id: I4279f5feffb9512af66243969efaaadfb9011962
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 edf372144..63211bde1 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -3698,6 +3698,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); |