DO NOT MERGE Pass focusableMode when adding focusables from PagedView.

Bug: 6421918
Change-Id: I9eb7c6fbb6654821642403f09baa5cb2536b5af4
This commit is contained in:
alanv
2012-05-07 17:33:22 -07:00
parent 8a0bff5e35
commit af51995758
+3 -3
View File
@@ -837,15 +837,15 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
@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);
}
}
}