diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-06-05 17:40:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-05 17:40:27 +0000 |
| commit | 8d8c73b591bf58f93f8841938ad8ce92085f7105 (patch) | |
| tree | d09f97fb959cdda914b37d2e5046fd251a0a9951 /src/com/android/launcher3/FocusHelper.java | |
| parent | 2e6e9b879591068864c4623f414e792707aa2aca (diff) | |
| parent | 4f3e9383eb422c87e2689548653b89f34f5516a5 (diff) | |
| download | android_packages_apps_Trebuchet-8d8c73b591bf58f93f8841938ad8ce92085f7105.tar.gz android_packages_apps_Trebuchet-8d8c73b591bf58f93f8841938ad8ce92085f7105.tar.bz2 android_packages_apps_Trebuchet-8d8c73b591bf58f93f8841938ad8ce92085f7105.zip | |
Merge "Code cleanup" into ub-launcher3-burnaby
Diffstat (limited to 'src/com/android/launcher3/FocusHelper.java')
| -rw-r--r-- | src/com/android/launcher3/FocusHelper.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/launcher3/FocusHelper.java b/src/com/android/launcher3/FocusHelper.java index 70bb01af0..57aec3280 100644 --- a/src/com/android/launcher3/FocusHelper.java +++ b/src/com/android/launcher3/FocusHelper.java @@ -222,8 +222,8 @@ public class FocusHelper { if (keyCode == KeyEvent.KEYCODE_DPAD_UP && !profile.isVerticalBarLayout()) { matrix = FocusLogic.createSparseMatrix(iconLayout, hotseatLayout, - true /* hotseat horizontal */, hotseat.getAllAppsButtonRank(), - iconRank == hotseat.getAllAppsButtonRank() /* include all apps icon */); + true /* hotseat horizontal */, profile.inv.hotseatAllAppsRank, + iconRank == profile.inv.hotseatAllAppsRank /* include all apps icon */); iconIndex += iconParent.getChildCount(); countX = iconLayout.getCountX(); countY = iconLayout.getCountY() + hotseatLayout.getCountY(); @@ -231,8 +231,8 @@ public class FocusHelper { } else if (keyCode == KeyEvent.KEYCODE_DPAD_LEFT && profile.isVerticalBarLayout()) { matrix = FocusLogic.createSparseMatrix(iconLayout, hotseatLayout, - false /* hotseat horizontal */, hotseat.getAllAppsButtonRank(), - iconRank == hotseat.getAllAppsButtonRank() /* include all apps icon */); + false /* hotseat horizontal */, profile.inv.hotseatAllAppsRank, + iconRank == profile.inv.hotseatAllAppsRank /* include all apps icon */); iconIndex += iconParent.getChildCount(); countX = iconLayout.getCountX() + hotseatLayout.getCountX(); countY = iconLayout.getCountY(); @@ -316,13 +316,13 @@ public class FocusHelper { // with the hotseat. if (keyCode == KeyEvent.KEYCODE_DPAD_DOWN && !profile.isVerticalBarLayout()) { matrix = FocusLogic.createSparseMatrix(iconLayout, hotseatLayout, true /* horizontal */, - hotseat.getAllAppsButtonRank(), + profile.inv.hotseatAllAppsRank, !hotseat.hasIcons() /* ignore all apps icon, unless there are no other icons */); countY = countY + 1; } else if (keyCode == KeyEvent.KEYCODE_DPAD_RIGHT && profile.isVerticalBarLayout()) { matrix = FocusLogic.createSparseMatrix(iconLayout, hotseatLayout, false /* horizontal */, - hotseat.getAllAppsButtonRank(), + profile.inv.hotseatAllAppsRank, !hotseat.hasIcons() /* ignore all apps icon, unless there are no other icons */); countX = countX + 1; } else if (keyCode == KeyEvent.KEYCODE_DEL || keyCode == KeyEvent.KEYCODE_FORWARD_DEL) { |