Merge "Set accessibility cursor position in non-editable views with content description." (191bdba8) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+19 −0

Original line number	Diff line number	Diff line
		@@ -5082,6 +5082,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		}

		if (mContentDescription != null && mContentDescription.length() > 0) {
		info.addAction(AccessibilityNodeInfo.ACTION_SET_SELECTION);
		info.addAction(AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY);
		info.addAction(AccessibilityNodeInfo.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY);
		info.setMovementGranularities(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_CHARACTER
		@@ -7022,6 +7023,24 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		return previousAtGranularity(granularity, extendSelection);
		}
		} break;
		case AccessibilityNodeInfo.ACTION_SET_SELECTION: {
		CharSequence text = getIterableTextForAccessibility();
		if (text == null) {
		return false;
		}
		final int start = (arguments != null) ? arguments.getInt(
		AccessibilityNodeInfo.ACTION_ARGUMENT_SELECTION_START_INT, -1) : -1;
		final int end = (arguments != null) ? arguments.getInt(
		AccessibilityNodeInfo.ACTION_ARGUMENT_SELECTION_END_INT, -1) : -1;
		// Only cursor position can be specified (selection length == 0)
		if ((getAccessibilitySelectionStart() != start
		\|\| getAccessibilitySelectionEnd() != end)
		&& (start == end)) {
		setAccessibilitySelection(start, end);
		notifyAccessibilityStateChanged();
		return true;
		}
		} break;
		}
		return false;
		}

+19 −17

Original line number	Diff line number	Diff line
		@@ -8030,14 +8030,15 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		} return false;
		case AccessibilityNodeInfo.ACTION_SET_SELECTION: {
		if (isFocused() && canSelectText()) {
		final int start = (arguments != null) ? arguments.getInt(
		AccessibilityNodeInfo.ACTION_ARGUMENT_SELECTION_START_INT, -1) : -1;
		final int end = (arguments != null) ? arguments.getInt(
		AccessibilityNodeInfo.ACTION_ARGUMENT_SELECTION_END_INT, -1) : -1;
		CharSequence text = getIterableTextForAccessibility();
		if (text == null) {
		return false;
		}
		final int start = (arguments != null) ? arguments.getInt(
		AccessibilityNodeInfo.ACTION_ARGUMENT_SELECTION_START_INT, -1) : -1;
		final int end = (arguments != null) ? arguments.getInt(
		AccessibilityNodeInfo.ACTION_ARGUMENT_SELECTION_END_INT, -1) : -1;
		if ((getSelectionStart() != start \|\| getSelectionEnd() != end)) {
		// No arguments clears the selection.
		if (start == end && end == -1) {
		Selection.removeSelection((Spannable) text);
		@@ -8054,6 +8055,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		return true;
		}
		}
		}
		} return false;
		default: {
		return super.performAccessibilityAction(action, arguments);