Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev (9973643b) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -8185,8 +8185,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		* @see #performAccessibilityAction(int, Bundle)
		*
		* Note: Called from the default {@link AccessibilityDelegate}.
		*
		* @hide Until we've refactored all accessibility delegation methods.
		*/
		boolean performAccessibilityActionInternal(int action, Bundle arguments) {
		public boolean performAccessibilityActionInternal(int action, Bundle arguments) {
		switch (action) {
		case AccessibilityNodeInfo.ACTION_CLICK: {
		if (isClickable()) {

+9 −3

Original line number	Diff line number	Diff line
		@@ -8475,8 +8475,14 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		}
		}

		/**
		* Performs an accessibility action after it has been offered to the
		* delegate.
		*
		* @hide
		*/
		@Override
		public boolean performAccessibilityAction(int action, Bundle arguments) {
		public boolean performAccessibilityActionInternal(int action, Bundle arguments) {
		switch (action) {
		case AccessibilityNodeInfo.ACTION_CLICK: {
		boolean handled = false;
		@@ -8557,10 +8563,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		case AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY:
		case AccessibilityNodeInfo.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY: {
		ensureIterableTextForAccessibilitySelectable();
		return super.performAccessibilityAction(action, arguments);
		return super.performAccessibilityActionInternal(action, arguments);
		}
		default: {
		return super.performAccessibilityAction(action, arguments);
		return super.performAccessibilityActionInternal(action, arguments);
		}
		}
		}