Check in FocusLogic that focused view fits into the matrix created for
cell-layout. Temporarily there can be a mismatch.
Bug: 73346286
Change-Id: Id014332d585c73b2be92da1f24db82484f103de4
diff --git a/src/com/android/launcher3/util/FocusLogic.java b/src/com/android/launcher3/util/FocusLogic.java
index b80e94d..b793f54 100644
--- a/src/com/android/launcher3/util/FocusLogic.java
+++ b/src/com/android/launcher3/util/FocusLogic.java
@@ -177,7 +177,10 @@
}
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);