diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2015-03-05 00:35:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-05 00:35:13 +0000 |
| commit | bd6fde13dfa46b723d7a0560d40aa0d977e8cf6a (patch) | |
| tree | 6afbfb5ae77e0aceff9280a62ee9b4885b275270 | |
| parent | cbd02cefc8e07f2d4f7a5364225596eefbf8db51 (diff) | |
| parent | ac721f8d5f869aa8a11cd247fe3ad5a7b3dd47cd (diff) | |
| download | android_packages_apps_Trebuchet-bd6fde13dfa46b723d7a0560d40aa0d977e8cf6a.tar.gz android_packages_apps_Trebuchet-bd6fde13dfa46b723d7a0560d40aa0d977e8cf6a.tar.bz2 android_packages_apps_Trebuchet-bd6fde13dfa46b723d7a0560d40aa0d977e8cf6a.zip | |
Merge "Fix the broken build from recent focus navigation handling code (compilation error)." into ub-launcher3-burnaby
| -rw-r--r-- | src/com/android/launcher3/FocusHelper.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/FocusHelper.java b/src/com/android/launcher3/FocusHelper.java index ebb319b0b..c16e45b31 100644 --- a/src/com/android/launcher3/FocusHelper.java +++ b/src/com/android/launcher3/FocusHelper.java @@ -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); |