Merge "Deprecate ANI#getLabeledBy, ANI#setLabeledBy" into main (c4af00cc) · Commits · e / os / android_frameworks_base

core/api/current.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -55411,7 +55411,7 @@ package android.view.accessibility {
		method public CharSequence getHintText();
		method public int getInputType();
		method public android.view.accessibility.AccessibilityNodeInfo getLabelFor();
		method public android.view.accessibility.AccessibilityNodeInfo getLabeledBy();
		method @Deprecated @FlaggedApi("android.view.accessibility.support_multiple_labeledby") public android.view.accessibility.AccessibilityNodeInfo getLabeledBy();
		method @FlaggedApi("android.view.accessibility.support_multiple_labeledby") @NonNull public java.util.List<android.view.accessibility.AccessibilityNodeInfo> getLabeledByList();
		method public int getLiveRegion();
		method public int getMaxTextLength();
		@@ -55511,8 +55511,8 @@ package android.view.accessibility {
		method public void setInputType(int);
		method public void setLabelFor(android.view.View);
		method public void setLabelFor(android.view.View, int);
		method public void setLabeledBy(android.view.View);
		method public void setLabeledBy(android.view.View, int);
		method @Deprecated @FlaggedApi("android.view.accessibility.support_multiple_labeledby") public void setLabeledBy(android.view.View);
		method @Deprecated @FlaggedApi("android.view.accessibility.support_multiple_labeledby") public void setLabeledBy(android.view.View, int);
		method public void setLiveRegion(int);
		method public void setLongClickable(boolean);
		method public void setMaxTextLength(int);

core/java/android/view/View.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import static android.view.accessibility.Flags.FLAG_DEPRECATE_ACCESSIBILITY_ANNO
		import static android.view.accessibility.Flags.FLAG_SUPPLEMENTAL_DESCRIPTION;
		import static android.view.accessibility.Flags.removeChildHoverCheckForTouchExploration;
		import static android.view.accessibility.Flags.supplementalDescription;
		import static android.view.accessibility.Flags.supportMultipleLabeledby;
		import static android.view.displayhash.DisplayHashResultCallback.DISPLAY_HASH_ERROR_INVALID_BOUNDS;
		import static android.view.displayhash.DisplayHashResultCallback.DISPLAY_HASH_ERROR_MISSING_WINDOW;
		import static android.view.displayhash.DisplayHashResultCallback.DISPLAY_HASH_ERROR_NOT_VISIBLE_ON_SCREEN;
		@@ -11402,8 +11403,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback,

		View label = rootView.findLabelForView(this, mID);
		if (label != null) {
		if (supportMultipleLabeledby()) {
		info.addLabeledBy(label);
		} else {
		info.setLabeledBy(label);
		}
		}

		if ((mAttachInfo.mAccessibilityFetchFlags
		& AccessibilityNodeInfo.FLAG_SERVICE_REQUESTS_REPORT_VIEW_IDS) != 0

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

+13 −0

Original line number	Diff line number	Diff line
		@@ -4040,8 +4040,12 @@ public class AccessibilityNodeInfo implements Parcelable {
		* Sets the view which serves as the label of the view represented by
		* this info for accessibility purposes.
		*
		* @deprecated Use {@link #addLabeledBy(View)} or {@link #removeLabeledBy(View)} instead.
		*
		* @param label The view that labels this node's source.
		*/
		@FlaggedApi(Flags.FLAG_SUPPORT_MULTIPLE_LABELEDBY)
		@Deprecated
		public void setLabeledBy(View label) {
		setLabeledBy(label, AccessibilityNodeProvider.HOST_VIEW_ID);
		}
		@@ -4062,9 +4066,14 @@ public class AccessibilityNodeInfo implements Parcelable {
		* This class is made immutable before being delivered to an AccessibilityService.
		* </p>
		*
		* @deprecated Use {@link #addLabeledBy(View, int)} or {@link #removeLabeledBy(View, int)}
		* instead.
		*
		* @param root The root whose virtual descendant labels this node's source.
		* @param virtualDescendantId The id of the virtual descendant.
		*/
		@FlaggedApi(Flags.FLAG_SUPPORT_MULTIPLE_LABELEDBY)
		@Deprecated
		public void setLabeledBy(View root, int virtualDescendantId) {
		enforceNotSealed();
		final int rootAccessibilityViewId = (root != null)
		@@ -4086,8 +4095,12 @@ public class AccessibilityNodeInfo implements Parcelable {
		* Gets the node info which serves as the label of the view represented by
		* this info for accessibility purposes.
		*
		* @deprecated Use {@link #getLabeledByList()} instead.
		*
		* @return The label.
		*/
		@FlaggedApi(Flags.FLAG_SUPPORT_MULTIPLE_LABELEDBY)
		@Deprecated
		public AccessibilityNodeInfo getLabeledBy() {
		enforceSealed();
		return getNodeForAccessibilityId(mConnectionId, mWindowId, mLabeledById);