Don't move to adjacent page if it is full when dropping on it.

Bug: 32003721 Change-Id: Ia81b75a73f510ad2a58764dec9eb7e57b9bf2dcd
2016-10-24 10:27:56 -07:00
parent 5fd72d865e
commit d1f034708b
1 changed files with 5 additions and 5 deletions
@@ -2647,12 +2647,12 @@ public class Workspace extends PagedView
                            resultSpan[1]);
                }

-                if (getScreenIdForPageIndex(mCurrentPage) != screenId && !hasMovedIntoHotseat) {
-                    snapScreen = getPageIndexForScreenId(screenId);
-                    snapToPage(snapScreen);
-                }
-
                if (foundCell) {
+                    if (getScreenIdForPageIndex(mCurrentPage) != screenId && !hasMovedIntoHotseat) {
+                        snapScreen = getPageIndexForScreenId(screenId);
+                        snapToPage(snapScreen);
+                    }
+
                    final ItemInfo info = (ItemInfo) cell.getTag();
                    if (hasMovedLayouts) {
                        // Reparent the view