am 2ceccf83: Merge "Workaround for default workspace widgets not getting notified for new widget sizes. (Bug 6439962)" into jb-dev
* commit '2ceccf83f479d4e161a5f87ee51b21230600abef':
Workaround for default workspace widgets not getting notified for new widget sizes. (Bug 6439962)
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index 34301a3..f60a204 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -80,6 +80,7 @@
android:layout_gravity="right"
android:clickable="true"
android:onClick="onClickVoiceButton"
+ android:importantForAccessibility="no"
launcher:sourceViewId="@+id/voice_button" />
<include layout="@layout/apps_customize_pane"
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index adfe0de..a5539db 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -837,15 +837,15 @@
@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);
}
}
}