commit af51995758ffa082ee082414431b6850a923d49a
author alanv <alanv@google.com> Mon May 07 17:33:22 2012 -0700
committer alanv <alanv@google.com> Mon May 07 17:33:22 2012 -0700
tree 5667ac97dc0af7b4e37ad1e5c1399faaa2771771
parent 8a0bff5e35f63321178bbf777ec24d42544866b3

DO NOT MERGE Pass focusableMode when adding focusables from PagedView.

Bug: 6421918
Change-Id: I9eb7c6fbb6654821642403f09baa5cb2536b5af4

src/com/android/launcher2/PagedView.java

diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index adfe0de..a5539db 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -837,15 +837,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);
             }
         }
     }