diff options
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 765fca499..aadcd8799 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2781,7 +2781,8 @@ public class Launcher extends Activity // The hotseat touch handling does not go through Workspace, and we always allow long press // on hotseat items. final View itemUnderLongClick = longClickCellInfo.cell; - boolean allowLongPress = isHotseatLayout(v) || mWorkspace.allowLongPress(); + final boolean inHotseat = isHotseatLayout(v); + boolean allowLongPress = inHotseat || mWorkspace.allowLongPress(); if (allowLongPress && !mDragController.isDragging()) { if (itemUnderLongClick == null) { // User long pressed on empty space @@ -2794,7 +2795,11 @@ public class Launcher extends Activity mWorkspace.enterOverviewMode(); } } else { - if (!(itemUnderLongClick instanceof Folder)) { + final boolean isAllAppsButton = inHotseat && isAllAppsButtonRank( + mHotseat.getOrderInHotseat( + longClickCellInfo.cellX, + longClickCellInfo.cellY)); + if (!(itemUnderLongClick instanceof Folder || isAllAppsButton)) { // User long pressed on an item mWorkspace.startDrag(longClickCellInfo); } |