From af51995758ffa082ee082414431b6850a923d49a Mon Sep 17 00:00:00 2001 From: alanv Date: Mon, 7 May 2012 17:33:22 -0700 Subject: [PATCH] DO NOT MERGE Pass focusableMode when adding focusables from PagedView. Bug: 6421918 Change-Id: I9eb7c6fbb6654821642403f09baa5cb2536b5af4 --- src/com/android/launcher2/PagedView.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java index adfe0de813..a5539db660 100644 --- a/src/com/android/launcher2/PagedView.java +++ b/src/com/android/launcher2/PagedView.java @@ -837,15 +837,15 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc @Override public void addFocusables(ArrayList 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); } } }