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

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

Merge changes from topic 'langdet' into oc-dev 

am: e70ce27c

Change-Id: I1eed4fc48bb5722f6b0c98a1b671a1eae172855f
parents dc3a44ec e70ce27c

api/current.txt

+0 −5
Original line number Diff line number Diff line
@@ -48286,10 +48286,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);










@@ -48318,7 +48314,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;

























api/system-current.txt



+0
−5




























Original line number
Diff line number
Diff line








@@ -51867,10 +51867,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);










@@ -51899,7 +51895,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;

























api/test-current.txt



+0
−5




























Original line number
Diff line number
Diff line








@@ -48681,10 +48681,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);










@@ -48713,7 +48709,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;

























core/java/android/view/textclassifier/LinksInfo.java



+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 {

















































core/java/android/view/textclassifier/TextClassifier.java



+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);