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

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

Merge "Stop explicitly snapping to page when navigating with keyboard." into... 

Merge "Stop explicitly snapping to page when navigating with keyboard." into ub-launcher3-burnaby-polish
parents 1b323794 25189851

src/com/android/launcher3/FocusHelper.java

+2 −7
Original line number Diff line number Diff line
@@ -142,7 +142,8 @@ public class FocusHelper { 
                    newParent = getCellLayoutChildrenForIndex(pagedView, pageIndex + 1);

                    if (newParent != null) {

                        pagedView.snapToPage(pageIndex + 1);

                        child = FocusLogic.getAdjacentChildInNextPage(newParent, v, newIconIndex);

                        child = FocusLogic.getAdjacentChildInNextFolderPage(

                                newParent, v, newIconIndex);

                    }

                    break;

                case FocusLogic.CURRENT_PAGE_FIRST_ITEM:
@@ -364,9 +365,7 @@ public class FocusHelper { 
                }

                int row = ((CellLayout.LayoutParams) v.getLayoutParams()).cellY;

                parent = getCellLayoutChildrenForIndex(workspace, newPageIndex);

                workspace.snapToPage(newPageIndex);

                if (parent != null) {

                    workspace.snapToPage(newPageIndex);

                    iconLayout = (CellLayout) parent.getParent();

                    matrix = FocusLogic.createSparseMatrix(iconLayout,

                        iconLayout.getCountX(), row);
@@ -379,17 +378,14 @@ public class FocusHelper { 
            case FocusLogic.PREVIOUS_PAGE_FIRST_ITEM:

                parent = getCellLayoutChildrenForIndex(workspace, pageIndex - 1);

                newIcon = parent.getChildAt(0);

                workspace.snapToPage(pageIndex - 1);

                break;

            case FocusLogic.PREVIOUS_PAGE_LAST_ITEM:

                parent = getCellLayoutChildrenForIndex(workspace, pageIndex - 1);

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

                workspace.snapToPage(pageIndex - 1);

                break;

            case FocusLogic.NEXT_PAGE_FIRST_ITEM:

                parent = getCellLayoutChildrenForIndex(workspace, pageIndex + 1);

                newIcon = parent.getChildAt(0);

                workspace.snapToPage(pageIndex + 1);

                break;

            case FocusLogic.NEXT_PAGE_LEFT_COLUMN:

            case FocusLogic.PREVIOUS_PAGE_LEFT_COLUMN:
@@ -400,7 +396,6 @@ public class FocusHelper { 
                row = ((CellLayout.LayoutParams) v.getLayoutParams()).cellY;

                parent = getCellLayoutChildrenForIndex(workspace, newPageIndex);

                if (parent != null) {

                    workspace.snapToPage(newPageIndex);

                    iconLayout = (CellLayout) parent.getParent();

                    matrix = FocusLogic.createSparseMatrix(iconLayout, -1, row);

                    newIconIndex = FocusLogic.handleKeyEvent(keyCode, countX + 1, countY,

src/com/android/launcher3/util/FocusLogic.java

+2 −2
Original line number Diff line number Diff line
@@ -494,9 +494,9 @@ public class FocusLogic { 
    /**

     * @param edgeColumn the column of the new icon. either {@link #NEXT_PAGE_LEFT_COLUMN} or

     * {@link #NEXT_PAGE_RIGHT_COLUMN}

     * @return the view adjacent to {@param oldView} in the {@param nextPage}.

     * @return the view adjacent to {@param oldView} in the {@param nextPage} of the folder.

     */

    public static View getAdjacentChildInNextPage(

    public static View getAdjacentChildInNextFolderPage(

            ShortcutAndWidgetContainer nextPage, View oldView, int edgeColumn) {

        final int newRow = ((CellLayout.LayoutParams) oldView.getLayoutParams()).cellY;