diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 0a92f35632..98e9956d87 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2586,16 +2586,14 @@ public class Launcher extends Activity boolean allowLongPress = isHotseatLayout(v) || mWorkspace.allowLongPress(); if (allowLongPress && !mDragController.isDragging()) { if (itemUnderLongClick == null) { - if (mWorkspace.hasNonCustomEmptyScreens()) { - // User long pressed on empty space - mWorkspace.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, - HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING); - // Disabling reordering until we sort out some issues. - if (mWorkspace.isInOverviewMode()) { - mWorkspace.startReordering(v); - } else { - mWorkspace.enterOverviewMode(); - } + // User long pressed on empty space + mWorkspace.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, + HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING); + // Disabling reordering until we sort out some issues. + if (mWorkspace.isInOverviewMode()) { + mWorkspace.startReordering(v); + } else { + mWorkspace.enterOverviewMode(); } } else { if (!(itemUnderLongClick instanceof Folder)) { diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index eed5b23ce8..3d467a164d 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -653,18 +653,6 @@ public class Workspace extends SmoothPagedView return -1; } - public boolean hasNonCustomEmptyScreens() { - Launcher.addDumpLog(TAG, "10249126 - hasNonCustomEmptyScreens()", true); - Iterator iter = mWorkspaceScreens.keySet().iterator(); - while (iter.hasNext()) { - long id = iter.next(); - if (id >= 0) { - return true; - } - } - return false; - } - ArrayList getScreenOrder() { return mScreenOrder; }