commit bec653ea44429bbe85fb334a8c8ba6520e3fa209
author Michael Jurka <mikejurka@google.com> Mon May 07 17:35:07 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 07 17:35:07 2012 -0700
tree 3403a228727f64e6d70432d9ee054c6fba0d568b
parent fc4e501780adf9918508f8abd31f88bd14d60077
parent af51995758ffa082ee082414431b6850a923d49a

Merge "DO NOT MERGE Pass focusableMode when adding focusables from PagedView." into jb-dev

src/com/android/launcher2/PagedView.java

diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index b850ce2..a3080a8 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -839,15 +839,15 @@
     @Override
     public void addFocusables(ArrayList<View> views, int direction, int focusableMode) {
         if (mCurrentPage >= 0 && mCurrentPage < getPageCount()) {
-            getPageAt(mCurrentPage).addFocusables(views, direction);
+            getPageAt(mCurrentPage).addFocusables(views, direction, focusableMode);
         }
         if (direction == View.FOCUS_LEFT) {
             if (mCurrentPage > 0) {
-                getPageAt(mCurrentPage - 1).addFocusables(views, direction);
+                getPageAt(mCurrentPage - 1).addFocusables(views, direction, focusableMode);
             }
         } else if (direction == View.FOCUS_RIGHT){
             if (mCurrentPage < getPageCount() - 1) {
-                getPageAt(mCurrentPage + 1).addFocusables(views, direction);
+                getPageAt(mCurrentPage + 1).addFocusables(views, direction, focusableMode);
             }
         }
     }