Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4fa7a9c authored by Dan Sandler's avatar Dan Sandler Committed by Android (Google) Code Review
Browse files

Merge "Fix longpress crash." into jb-ub-now-kermit

parents d7315948 e26d0948

src/com/android/launcher3/Launcher.java

+7 −2
Original line number Diff line number Diff line
@@ -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);

                }