From 9883c9ae25a60b0be12f66f624a7eeff6781c175 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Fri, 26 Jul 2013 13:50:47 -0700 Subject: Prevent dragging workspace items to custom content page. Change-Id: I4279f5feffb9512af66243969efaaadfb9011962 --- src/com/android/launcher3/Workspace.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/com/android/launcher3') 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); -- cgit v1.2.3