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

Commit e498b995 authored by Abodunrinwa Toki's avatar Abodunrinwa Toki Committed by android-build-merger
Browse files

Merge changes from topic 'am-bbd64631c3584513a9a39c2ec7139a27' into oc-dev-plus-aosp

am: 9f17850a

Change-Id: I2fb3c54ad622055353f6cec77088eaa5924bafa6
parents d007e970 9f17850a
Loading
Loading
Loading
Loading
+0 −5
Original line number Diff line number Diff line
@@ -48299,10 +48299,6 @@ package android.view.inputmethod {
package android.view.textclassifier {
  public abstract interface LinksInfo {
    method public abstract boolean apply(java.lang.CharSequence);
  }
  public final class TextClassificationManager {
    method public android.view.textclassifier.TextClassifier getTextClassifier();
    method public void setTextClassifier(android.view.textclassifier.TextClassifier);
@@ -48331,7 +48327,6 @@ package android.view.textclassifier {
  }
  public abstract interface TextClassifier {
    method public abstract android.view.textclassifier.LinksInfo getLinks(java.lang.CharSequence, int, android.os.LocaleList);
    method public abstract android.view.textclassifier.TextClassificationResult getTextClassificationResult(java.lang.CharSequence, int, int, android.os.LocaleList);
    method public abstract android.view.textclassifier.TextSelection suggestSelection(java.lang.CharSequence, int, int, android.os.LocaleList);
    field public static final android.view.textclassifier.TextClassifier NO_OP;
+0 −5
Original line number Diff line number Diff line
@@ -51882,10 +51882,6 @@ package android.view.inputmethod {
package android.view.textclassifier {
  public abstract interface LinksInfo {
    method public abstract boolean apply(java.lang.CharSequence);
  }
  public final class TextClassificationManager {
    method public android.view.textclassifier.TextClassifier getTextClassifier();
    method public void setTextClassifier(android.view.textclassifier.TextClassifier);
@@ -51914,7 +51910,6 @@ package android.view.textclassifier {
  }
  public abstract interface TextClassifier {
    method public abstract android.view.textclassifier.LinksInfo getLinks(java.lang.CharSequence, int, android.os.LocaleList);
    method public abstract android.view.textclassifier.TextClassificationResult getTextClassificationResult(java.lang.CharSequence, int, int, android.os.LocaleList);
    method public abstract android.view.textclassifier.TextSelection suggestSelection(java.lang.CharSequence, int, int, android.os.LocaleList);
    field public static final android.view.textclassifier.TextClassifier NO_OP;
+0 −5
Original line number Diff line number Diff line
@@ -48694,10 +48694,6 @@ package android.view.inputmethod {
package android.view.textclassifier {
  public abstract interface LinksInfo {
    method public abstract boolean apply(java.lang.CharSequence);
  }
  public final class TextClassificationManager {
    method public android.view.textclassifier.TextClassifier getTextClassifier();
    method public void setTextClassifier(android.view.textclassifier.TextClassifier);
@@ -48726,7 +48722,6 @@ package android.view.textclassifier {
  }
  public abstract interface TextClassifier {
    method public abstract android.view.textclassifier.LinksInfo getLinks(java.lang.CharSequence, int, android.os.LocaleList);
    method public abstract android.view.textclassifier.TextClassificationResult getTextClassificationResult(java.lang.CharSequence, int, int, android.os.LocaleList);
    method public abstract android.view.textclassifier.TextSelection suggestSelection(java.lang.CharSequence, int, int, android.os.LocaleList);
    field public static final android.view.textclassifier.TextClassifier NO_OP;
+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.annotation.NonNull;
 * Link information that can be applied to text. See: {@link #apply(CharSequence)}.
 * Typical implementations of this interface will annotate spannable text with e.g
 * {@link android.text.style.ClickableSpan}s or other annotations.
 * @hide
 */
public interface LinksInfo {

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ public interface TextClassifier {
     *      a default locale, or use the system default.
     *
     * @throws IllegalArgumentException if text is null
     * @hide
     */
    LinksInfo getLinks(
            @NonNull CharSequence text, int linkMask, @Nullable LocaleList defaultLocales);