diff options
author | Tony Wickham <twickham@google.com> | 2016-10-24 10:27:56 -0700 |
---|---|---|
committer | Tony Wickham <twickham@google.com> | 2016-10-24 10:27:56 -0700 |
commit | d1f034708b591f0648f2a8ad47b6e857cd328e52 (patch) | |
tree | 0c2ab5b52b1a8995d964299450d18570b66cab29 /src/com/android/launcher3/Workspace.java | |
parent | 5fd72d865e690a3bafedd39a6237152dbc894cc9 (diff) | |
download | android_packages_apps_Trebuchet-d1f034708b591f0648f2a8ad47b6e857cd328e52.tar.gz android_packages_apps_Trebuchet-d1f034708b591f0648f2a8ad47b6e857cd328e52.tar.bz2 android_packages_apps_Trebuchet-d1f034708b591f0648f2a8ad47b6e857cd328e52.zip |
Don't move to adjacent page if it is full when dropping on it.
Bug: 32003721
Change-Id: Ia81b75a73f510ad2a58764dec9eb7e57b9bf2dcd
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index ae3463820..b88ffd913 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -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 |