summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoralanv <alanv@google.com>2012-05-07 17:33:22 -0700
committeralanv <alanv@google.com>2012-05-07 17:33:22 -0700
commitaf51995758ffa082ee082414431b6850a923d49a (patch)
tree5667ac97dc0af7b4e37ad1e5c1399faaa2771771 /src
parent8a0bff5e35f63321178bbf777ec24d42544866b3 (diff)
downloadandroid_packages_apps_Trebuchet-af51995758ffa082ee082414431b6850a923d49a.tar.gz
android_packages_apps_Trebuchet-af51995758ffa082ee082414431b6850a923d49a.tar.bz2
android_packages_apps_Trebuchet-af51995758ffa082ee082414431b6850a923d49a.zip
DO NOT MERGE Pass focusableMode when adding focusables from PagedView.
Bug: 6421918 Change-Id: I9eb7c6fbb6654821642403f09baa5cb2536b5af4
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/PagedView.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index adfe0de81..a5539db66 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<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);
}
}
}