Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40404f43 authored Jun 02, 2012 by Svetoslav Ganov Committed by Android Git Automerger Jun 02, 2012

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

* commit 'cba5e879':
  Calling the correct method when adding accessibility focusables.

parents 0ec61ff5 cba5e879

core/java/android/view/View.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -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;
		}

core/java/android/widget/AbsListView.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;

core/java/android/widget/NumberPicker.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}