diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-05-07 17:35:07 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-07 17:35:07 -0700 |
| commit | bec653ea44429bbe85fb334a8c8ba6520e3fa209 (patch) | |
| tree | 3403a228727f64e6d70432d9ee054c6fba0d568b /src | |
| parent | fc4e501780adf9918508f8abd31f88bd14d60077 (diff) | |
| parent | af51995758ffa082ee082414431b6850a923d49a (diff) | |
| download | android_packages_apps_Trebuchet-bec653ea44429bbe85fb334a8c8ba6520e3fa209.tar.gz android_packages_apps_Trebuchet-bec653ea44429bbe85fb334a8c8ba6520e3fa209.tar.bz2 android_packages_apps_Trebuchet-bec653ea44429bbe85fb334a8c8ba6520e3fa209.zip | |
Merge "DO NOT MERGE Pass focusableMode when adding focusables from PagedView." into jb-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/PagedView.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java index b850ce275..a3080a846 100644 --- a/src/com/android/launcher2/PagedView.java +++ b/src/com/android/launcher2/PagedView.java @@ -839,15 +839,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); } } } |