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

Commit 92adb669 authored by Tony Wickham's avatar Tony Wickham Committed by android-build-merger
Browse files

Don\'t add cells to FocusLogic sparse matrix if they aren\'t focusable. 

am: df315180

* commit 'df315180':
  Don't add cells to FocusLogic sparse matrix if they aren't focusable.
parents a98e2105 df315180

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

+18 −6
Original line number Diff line number Diff line
@@ -165,8 +165,12 @@ public class FocusLogic { 


        // Iterate thru the children.

        for (int i = 0; i < parent.getChildCount(); i++ ) {

            int cx = ((CellLayout.LayoutParams) parent.getChildAt(i).getLayoutParams()).cellX;

            int cy = ((CellLayout.LayoutParams) parent.getChildAt(i).getLayoutParams()).cellY;

            View cell = parent.getChildAt(i);

            if (!cell.isFocusable()) {

                continue;

            }

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

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

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

        }

        if (DEBUG) {
@@ -199,8 +203,12 @@ public class FocusLogic { 


        // Iterate thru the children of the top parent.

        for (int i = 0; i < iconParent.getChildCount(); i++) {

            int cx = ((CellLayout.LayoutParams) iconParent.getChildAt(i).getLayoutParams()).cellX;

            int cy = ((CellLayout.LayoutParams) iconParent.getChildAt(i).getLayoutParams()).cellY;

            View cell = iconParent.getChildAt(i);

            if (!cell.isFocusable()) {

                continue;

            }

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

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

            matrix[cx][cy] = i;

        }
@@ -253,8 +261,12 @@ public class FocusLogic { 


        // Iterate thru the children of the top parent.

        for (int i = 0; i < iconParent.getChildCount(); i++) {

            int cx = ((CellLayout.LayoutParams) iconParent.getChildAt(i).getLayoutParams()).cellX;

            int cy = ((CellLayout.LayoutParams) iconParent.getChildAt(i).getLayoutParams()).cellY;

            View cell = iconParent.getChildAt(i);

            if (!cell.isFocusable()) {

                continue;

            }

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

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

            if (pivotX < 0) {

                matrix[cx - pivotX][cy] = i;

            } else {