am bd6fde13: Merge "Fix the broken build from recent focus navigation handling code (compilation error)." into ub-launcher3-burnaby

* commit 'bd6fde13dfa46b723d7a0560d40aa0d977e8cf6a':
  Fix the broken build from recent focus navigation handling code (compilation error).
This commit is contained in:
Hyunyoung Song
2015-03-05 00:38:37 +00:00
committed by Android Git Automerger
+2 -2
View File
@@ -326,7 +326,7 @@ public class FocusHelper {
parent = getCellLayoutChildrenForIndex(workspace, pageIndex - 1);
if (parent != null) {
iconLayout = (CellLayout) parent.getParent();
matrix = FocusLogic.createSparseMatrix(iconLayout, orientation,
matrix = FocusLogic.createSparseMatrix(iconLayout,
iconLayout.getCountX(), row);
newIconIndex = FocusLogic.handleKeyEvent(keyCode, countX + 1, countY, matrix,
FocusLogic.PIVOT, pageIndex - 1, pageCount);
@@ -353,7 +353,7 @@ public class FocusHelper {
parent = getCellLayoutChildrenForIndex(workspace, pageIndex + 1);
if (parent != null) {
iconLayout = (CellLayout) parent.getParent();
matrix = FocusLogic.createSparseMatrix(iconLayout, orientation, -1, row);
matrix = FocusLogic.createSparseMatrix(iconLayout, -1, row);
newIconIndex = FocusLogic.handleKeyEvent(keyCode, countX + 1, countY, matrix,
FocusLogic.PIVOT, pageIndex, pageCount);
newIcon = parent.getChildAt(newIconIndex);