PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michael Jurka
2012-05-07 17:35:07 -07:00
committed by Android (Google) Code Review
parent fc4e501780 af51995758
commit bec653ea44
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/PagedView.java
+3 -3
View File
@@ -839,15 +839,15 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
@Override @Override
public void addFocusables(ArrayList<View> views, int direction, int focusableMode) { public void addFocusables(ArrayList<View> views, int direction, int focusableMode) {
if (mCurrentPage >= 0 && mCurrentPage < getPageCount()) { if (mCurrentPage >= 0 && mCurrentPage < getPageCount()) {
getPageAt(mCurrentPage).addFocusables(views, direction); getPageAt(mCurrentPage).addFocusables(views, direction, focusableMode);
} }
if (direction == View.FOCUS_LEFT) { if (direction == View.FOCUS_LEFT) {
if (mCurrentPage > 0) { if (mCurrentPage > 0) {
getPageAt(mCurrentPage - 1).addFocusables(views, direction); getPageAt(mCurrentPage - 1).addFocusables(views, direction, focusableMode);
} }
} else if (direction == View.FOCUS_RIGHT){ } else if (direction == View.FOCUS_RIGHT){
if (mCurrentPage < getPageCount() - 1) { if (mCurrentPage < getPageCount() - 1) {
getPageAt(mCurrentPage + 1).addFocusables(views, direction); getPageAt(mCurrentPage + 1).addFocusables(views, direction, focusableMode);
} }
} }
} }