From a90e4512ab81dcd8cdbefdd2ffa0de55fca1caa3 Mon Sep 17 00:00:00 2001 From: Svetoslav Ganov Date: Fri, 1 Jun 2012 19:02:32 -0700 Subject: Calling the correct method when adding accessibility focusables. 1. Since we added explicit accessibility focusable attribute when adding focusables views that do so should call this method. Some views were not updated to do so. bug:6581924 Change-Id: Id64c0b2d76e5269ebf3fbe17203e73b174bdb843 --- core/java/android/view/View.java | 5 +---- core/java/android/widget/AbsListView.java | 4 ++-- core/java/android/widget/NumberPicker.java | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) (limited to 'core') 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 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; } -- cgit v1.1