TextLinks API updates.

1. Change TextLinks.getText() return type from String to CharSequence
2. Javadoc improvement

Bug: 147761091
Test: atest FrameworksCoreTests:android.view.textclassifier
Test: atest android.view.textclassifier.cts.TextClassifierValueObjectsTest
Change-Id: I40e4f401025f96717272a9ea2aac4c168297191e
This commit is contained in:
Joanne Chung
2020-01-16 17:25:51 +08:00
parent 0ec08df9b1
commit eae7bb76a9
3 changed files with 19 additions and 11 deletions

View File

@@ -55634,7 +55634,7 @@ package android.view.textclassifier {
method public int describeContents();
method @NonNull public android.os.Bundle getExtras();
method @NonNull public java.util.Collection<android.view.textclassifier.TextLinks.TextLink> getLinks();
method @NonNull public String getText();
method @NonNull public CharSequence getText();
method public void writeToParcel(android.os.Parcel, int);
field public static final int APPLY_STRATEGY_IGNORE = 0; // 0x0
field public static final int APPLY_STRATEGY_REPLACE = 1; // 0x1

View File

@@ -113,7 +113,7 @@ public final class TextLinks implements Parcelable {
* Returns the text that was used to generate these links.
*/
@NonNull
public String getText() {
public CharSequence getText() {
return mFullText;
}
@@ -370,8 +370,8 @@ public final class TextLinks implements Parcelable {
}
/**
* @return ordered list of locale preferences that can be used to disambiguate
* the provided text
* Returns an ordered list of locale preferences that can be used to disambiguate the
* provided text.
*/
@Nullable
public LocaleList getDefaultLocales() {
@@ -379,7 +379,8 @@ public final class TextLinks implements Parcelable {
}
/**
* @return The config representing the set of entities to look for
* Returns the config representing the set of entities to look for
*
* @see Builder#setEntityConfig(EntityConfig)
*/
@Nullable
@@ -398,8 +399,8 @@ public final class TextLinks implements Parcelable {
}
/**
* @return reference time based on which relative dates (e.g. "tomorrow") should be
* interpreted.
* Returns reference time based on which relative dates (e.g. "tomorrow") should be
* interpreted.
*/
@Nullable
public ZonedDateTime getReferenceTime() {
@@ -473,6 +474,9 @@ public final class TextLinks implements Parcelable {
}
/**
* Sets ordered list of locale preferences that may be used to disambiguate the
* provided text.
*
* @param defaultLocales ordered list of locale preferences that may be used to
* disambiguate the provided text. If no locale preferences exist,
* set this to null or an empty locale list.
@@ -524,9 +528,11 @@ public final class TextLinks implements Parcelable {
}
/**
* @param referenceTime reference time based on which relative dates (e.g. "tomorrow"
* should be interpreted. This should usually be the time when the text was
* originally composed.
* Sets the reference time based on which relative dates (e.g.
* "tomorrow") should be interpreted.
*
* @param referenceTime reference time based on which relative dates. This should
* usually be the time when the text was originally composed.
*
* @return this builder
*/
@@ -716,6 +722,8 @@ public final class TextLinks implements Parcelable {
}
/**
* Adds a TextLink.
*
* @see #addLink(int, int, Map)
* @param urlSpan An optional URLSpan to delegate to. NOTE: Not parcelled.
*/

View File

@@ -113,7 +113,7 @@ public final class TextLinksParams {
return TextLinks.STATUS_UNSUPPORTED_CHARACTER;
}
if (!textString.startsWith(textLinks.getText())) {
if (!textString.startsWith(textLinks.getText().toString())) {
return TextLinks.STATUS_DIFFERENT_TEXT;
}
if (textLinks.getLinks().isEmpty()) {