Merge "Calling the correct method when adding accessibility focusables." into jb-dev

3 files changed, 4 insertions, 7 deletions

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 9613149..9f5613e 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -6308,10 +6308,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
         }
     }
 
-    /**
-     * @hide
-     */
-    public boolean canTakeAccessibilityFocusFromHover() {
+    private boolean canTakeAccessibilityFocusFromHover() {
         if (includeForAccessibility() && isActionableForAccessibility()) {
             return true;
         }
diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index edffb5e..a84ece6 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -1334,12 +1334,12 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
             switch(direction) {
                 case ACCESSIBILITY_FOCUS_BACKWARD: {
                     View focusable = (getChildCount() > 0) ? getChildAt(getChildCount() - 1) : this;
-                    if (focusable.canTakeAccessibilityFocusFromHover()) {
+                    if (focusable.isAccessibilityFocusable()) {
                         views.add(focusable);
                     }
                 } return;
                 case ACCESSIBILITY_FOCUS_FORWARD: {
-                    if (canTakeAccessibilityFocusFromHover()) {
+                    if (isAccessibilityFocusable()) {
                         views.add(this);
                     }
                 } return;
diff --git a/core/java/android/widget/NumberPicker.java b/core/java/android/widget/NumberPicker.java
index b60ffc5..a458f57 100644
--- a/core/java/android/widget/NumberPicker.java
+++ b/core/java/android/widget/NumberPicker.java
@@ -1421,7 +1421,7 @@ public class NumberPicker extends LinearLayout {
         // We do not want the real descendant to be considered focus search
         // since it is managed by the accessibility node provider.
         if ((focusableMode & FOCUSABLES_ACCESSIBILITY) == FOCUSABLES_ACCESSIBILITY) {
-            if (canTakeAccessibilityFocusFromHover() || getAccessibilityNodeProvider() != null) {
+            if (isAccessibilityFocusable()) {
                 views.add(this);
                 return;
             }