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

Commit 6d54b94a authored Mar 19, 2020 by Menghan Li Committed by Automerger Merge Worker Mar 19, 2020

Merge "Refines the javadoc of the ReplacementSpan.getContentDescription" into...

Merge "Refines the javadoc of the ReplacementSpan.getContentDescription" into rvc-dev am: b42dfe72

Change-Id: I5dd0322655be37fd2945fb674762ae59d5e1d163

parents c14d3016 b42dfe72

core/java/android/text/style/ReplacementSpan.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@ public abstract class ReplacementSpan extends MetricAffectingSpan {
		int top, int y, int bottom, @NonNull Paint paint);

		/**
		* Gets a brief description of this ImageSpan for use in accessibility support.
		* Gets a brief description of this ReplacementSpan for use in accessibility support.
		*
		* @return The content description.
		*/
		@@ -73,7 +73,7 @@ public abstract class ReplacementSpan extends MetricAffectingSpan {
		}

		/**
		* Sets the specific content description into ImageSpan.
		* Sets the specific content description into ReplacementSpan.
		* ReplacementSpans are shared with accessibility services,
		* but only the content description is available from them.
		*

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -2876,7 +2876,7 @@ public class AccessibilityNodeInfo implements Parcelable {
		}

		/**
		* Replaces any ClickableSpans in mText with placeholders.
		* Replaces any ClickableSpan in the given {@code text} with placeholders.
		*
		* @param text The text.
		*
		@@ -2910,7 +2910,7 @@ public class AccessibilityNodeInfo implements Parcelable {
		}

		/**
		* Replace any ImageSpans in mText with its content description.
		* Replaces any ReplacementSpan in the given {@code text} if the object has content description.
		*
		* @param text The text.
		*