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

Commit a43f78fc authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Handle more cases in FocusHelper#handleHotseatButtonKeyEvent()." into... 

Merge "Handle more cases in FocusHelper#handleHotseatButtonKeyEvent()." into ub-launcher3-burnaby-polish
parents 26b01425 4fc8287c

src/com/android/launcher3/FocusHelper.java

+34 −8
Original line number Diff line number Diff line
@@ -263,12 +263,38 @@ public class FocusHelper { 
                countY, matrix, iconIndex, pageIndex, pageCount, Utilities.isRtl(v.getResources()));



        View newIcon = null;

        if (newIconIndex == FocusLogic.NEXT_PAGE_FIRST_ITEM) {

        switch (newIconIndex) {

            case FocusLogic.NEXT_PAGE_FIRST_ITEM:

                parent = getCellLayoutChildrenForIndex(workspace, pageIndex + 1);

                newIcon = parent.getChildAt(0);

                // TODO(hyunyoungs): handle cases where the child is not an icon but

                // a folder or a widget.

                workspace.snapToPage(pageIndex + 1);

                break;

            case FocusLogic.PREVIOUS_PAGE_FIRST_ITEM:

                parent = getCellLayoutChildrenForIndex(workspace, pageIndex - 1);

                newIcon = parent.getChildAt(0);

                // TODO(hyunyoungs): handle cases where the child is not an icon but

                // a folder or a widget.

                workspace.snapToPage(pageIndex - 1);

                break;

            case FocusLogic.PREVIOUS_PAGE_LAST_ITEM:

                parent = getCellLayoutChildrenForIndex(workspace, pageIndex - 1);

                newIcon = parent.getChildAt(parent.getChildCount() - 1);

                // TODO(hyunyoungs): handle cases where the child is not an icon but

                // a folder or a widget.

                workspace.snapToPage(pageIndex - 1);

                break;

            case FocusLogic.PREVIOUS_PAGE_LEFT_COLUMN:

            case FocusLogic.PREVIOUS_PAGE_RIGHT_COLUMN:

                // Go to the previous page but keep the focus on the same hotseat icon.

                workspace.snapToPage(pageIndex - 1);

                break;

            case FocusLogic.NEXT_PAGE_LEFT_COLUMN:

            case FocusLogic.NEXT_PAGE_RIGHT_COLUMN:

                // Go to the next page but keep the focus on the same hotseat icon.

                workspace.snapToPage(pageIndex + 1);

                break;

        }

        if (parent == iconParent && newIconIndex >= iconParent.getChildCount()) {

            newIconIndex -= iconParent.getChildCount();