Merge "Add AccessibilityNodeInfo.isTextSelectable" (3e01ab61) · Commits · e / os / android_frameworks_base

core/api/current.txt

+2 −0

core/java/android/view/accessibility/AccessibilityNodeInfo.java

+40 −1

Original line number	Original line	Diff line number	Diff line
	@@ -710,6 +710,8 @@ public class AccessibilityNodeInfo implements Parcelable {

	private static final int BOOLEAN_PROPERTY_IS_TEXT_ENTRY_KEY = 0x0400000;		private static final int BOOLEAN_PROPERTY_IS_TEXT_ENTRY_KEY = 0x0400000;

			private static final int BOOLEAN_PROPERTY_IS_TEXT_SELECTABLE = 0x0800000;

	/**		/**
	* Bits that provide the id of a virtual descendant of a view.		* Bits that provide the id of a virtual descendant of a view.
	*/		*/
	@@ -2275,6 +2277,38 @@ public class AccessibilityNodeInfo implements Parcelable {
	setBooleanProperty(BOOLEAN_PROPERTY_SCROLLABLE, scrollable);		setBooleanProperty(BOOLEAN_PROPERTY_SCROLLABLE, scrollable);
	}		}

			/**
			* Gets if the node has selectable text.
			*
			* <p>
			* Services should use {@link #ACTION_SET_SELECTION} for selection. Editable text nodes must
			* also be selectable. But not all UIs will populate this field, so services should consider
			* 'isTextSelectable \| isEditable' to ensure they don't miss nodes with selectable text.
			* </p>
			*
			* @see #isEditable
			* @return True if the node has selectable text.
			*/
			public boolean isTextSelectable() {
			return getBooleanProperty(BOOLEAN_PROPERTY_IS_TEXT_SELECTABLE);
			}

			/**
			* Sets if the node has selectable text.
			* <p>
			* <strong>Note:</strong> Cannot be called from an
			* {@link android.accessibilityservice.AccessibilityService}.
			* This class is made immutable before being delivered to an AccessibilityService.
			* </p>
			*
			* @param selectableText True if the node has selectable text, false otherwise.
			*
			* @throws IllegalStateException If called from an AccessibilityService.
			*/
			public void setTextSelectable(boolean selectableText) {
			setBooleanProperty(BOOLEAN_PROPERTY_IS_TEXT_SELECTABLE, selectableText);
			}

	/**		/**
	* Gets if the node is editable.		* Gets if the node is editable.
	*		*
	@@ -4327,10 +4361,14 @@ public class AccessibilityNodeInfo implements Parcelable {
	return "ACTION_CANCEL_DRAG";		return "ACTION_CANCEL_DRAG";
	case R.id.accessibilityActionDragDrop:		case R.id.accessibilityActionDragDrop:
	return "ACTION_DROP";		return "ACTION_DROP";
	default:		default: {
			if (action == R.id.accessibilityActionShowSuggestions) {
			return "ACTION_SHOW_SUGGESTIONS";
			}
	return "ACTION_UNKNOWN";		return "ACTION_UNKNOWN";
	}		}
	}		}
			}

	/**		/**
	* Gets the human readable movement granularity symbolic name.		* Gets the human readable movement granularity symbolic name.
	@@ -4462,6 +4500,7 @@ public class AccessibilityNodeInfo implements Parcelable {
	builder.append("; importantForAccessibility: ").append(isImportantForAccessibility());		builder.append("; importantForAccessibility: ").append(isImportantForAccessibility());
	builder.append("; visible: ").append(isVisibleToUser());		builder.append("; visible: ").append(isVisibleToUser());
	builder.append("; actions: ").append(mActions);		builder.append("; actions: ").append(mActions);
			builder.append("; isTextSelectable: ").append(isTextSelectable());

	return builder.toString();		return builder.toString();
	}		}

core/java/android/widget/TextView.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -12289,6 +12289,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
	EXTRA_DATA_RENDERING_INFO_KEY,		EXTRA_DATA_RENDERING_INFO_KEY,
	EXTRA_DATA_TEXT_CHARACTER_LOCATION_KEY		EXTRA_DATA_TEXT_CHARACTER_LOCATION_KEY
	));		));
			info.setTextSelectable(isTextSelectable());
	} else {		} else {
	info.setAvailableExtraData(Arrays.asList(		info.setAvailableExtraData(Arrays.asList(
	EXTRA_DATA_RENDERING_INFO_KEY		EXTRA_DATA_RENDERING_INFO_KEY

core/tests/coretests/src/android/view/accessibility/AccessibilityNodeInfoTest.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -58,7 +58,7 @@ public class AccessibilityNodeInfoTest {

	// The number of flags held in boolean properties. Their values should also be double-checked		// The number of flags held in boolean properties. Their values should also be double-checked
	// in the methods above.		// in the methods above.
	private static final int NUM_BOOLEAN_PROPERTIES = 23;		private static final int NUM_BOOLEAN_PROPERTIES = 24;

	@Test		@Test
	public void testStandardActions_serializationFlagIsValid() {		public void testStandardActions_serializationFlagIsValid() {

Original line number	Original line	Diff line number	Diff line
	@@ -51668,6 +51668,7 @@ package android.view.accessibility {
	method public boolean isSelected();		method public boolean isSelected();
	method public boolean isShowingHintText();		method public boolean isShowingHintText();
	method public boolean isTextEntryKey();		method public boolean isTextEntryKey();
			method public boolean isTextSelectable();
	method public boolean isVisibleToUser();		method public boolean isVisibleToUser();
	method @Deprecated public static android.view.accessibility.AccessibilityNodeInfo obtain(android.view.View);		method @Deprecated public static android.view.accessibility.AccessibilityNodeInfo obtain(android.view.View);
	method @Deprecated public static android.view.accessibility.AccessibilityNodeInfo obtain(android.view.View, int);		method @Deprecated public static android.view.accessibility.AccessibilityNodeInfo obtain(android.view.View, int);
	@@ -51731,6 +51732,7 @@ package android.view.accessibility {
	method public void setStateDescription(@Nullable CharSequence);		method public void setStateDescription(@Nullable CharSequence);
	method public void setText(CharSequence);		method public void setText(CharSequence);
	method public void setTextEntryKey(boolean);		method public void setTextEntryKey(boolean);
			method public void setTextSelectable(boolean);
	method public void setTextSelection(int, int);		method public void setTextSelection(int, int);
	method public void setTooltipText(@Nullable CharSequence);		method public void setTooltipText(@Nullable CharSequence);
	method public void setTouchDelegateInfo(@NonNull android.view.accessibility.AccessibilityNodeInfo.TouchDelegateInfo);		method public void setTouchDelegateInfo(@NonNull android.view.accessibility.AccessibilityNodeInfo.TouchDelegateInfo);