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

Commit 9027e6ad authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Check in FocusLogic that focused view fits into the matrix created for... 

Merge "Check in FocusLogic that focused view fits into the matrix created for cell-layout. Temporarily there can be a mismatch." into ub-launcher3-master
parents 7b4b78c1 3d73e7aa

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

+4 −1
Original line number Diff line number Diff line
@@ -177,7 +177,10 @@ public class FocusLogic { 
            }

            int cx = ((CellLayout.LayoutParams) cell.getLayoutParams()).cellX;

            int cy = ((CellLayout.LayoutParams) cell.getLayoutParams()).cellY;

            matrix[invert ? (m - cx - 1) : cx][cy] = i;

            int x = invert ? (m - cx - 1) : cx;

            if (x < m && cy < n) { // check if view fits into matrix, else skip

                matrix[x][cy] = i;

            }

        }

        if (DEBUG) {

            printMatrix(matrix);