PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: df315180f0

* commit 'df315180f0653702b470beea62f27927e45fab4b':
  Don't add cells to FocusLogic sparse matrix if they aren't focusable.
This commit is contained in:
Tony Wickham
2015-10-22 01:12:49 +00:00
committed by android-build-merger
parent a98e210502 df315180f0
commit 92adb669da
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/util/FocusLogic.java
+18 -6
View File
@@ -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 {