Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* changes:
  Merge changes from topic 'langdet' into oc-dev am: e70ce27c44
  Hide TextClassificationManager.detectLanguages API am: 8557802248
This commit is contained in:
Android Build Merger (Role)
2017-04-24 19:03:10 +00:00
committed by Android (Google) Code Review
parent 02cdcd1285 1f34114a61
commit 9f17850a67
7 changed files with 4 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
api/current.txt
View File

@@ -48286,12 +48286,7 @@ 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 java.util.List<android.view.textclassifier.TextLanguage> detectLanguages(java.lang.CharSequence);
method public android.view.textclassifier.TextClassifier getTextClassifier();
method public void setTextClassifier(android.view.textclassifier.TextClassifier);
}
@@ -48319,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;
@@ -48330,20 +48324,6 @@ package android.view.textclassifier {
field public static final java.lang.String TYPE_URL = "url";
}
public final class TextLanguage {
method public float getConfidenceScore(java.util.Locale);
method public int getEndIndex();
method public java.util.Locale getLanguage(int);
method public int getLanguageCount();
method public int getStartIndex();
}
public static final class TextLanguage.Builder {
ctor public TextLanguage.Builder(int, int);
method public android.view.textclassifier.TextLanguage build();
method public android.view.textclassifier.TextLanguage.Builder setLanguage(java.util.Locale, float);
}
public final class TextSelection {
method public float getConfidenceScore(java.lang.String);
method public java.lang.String getEntity(int);

20
api/system-current.txt
View File

@@ -51867,12 +51867,7 @@ 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 java.util.List<android.view.textclassifier.TextLanguage> detectLanguages(java.lang.CharSequence);
method public android.view.textclassifier.TextClassifier getTextClassifier();
method public void setTextClassifier(android.view.textclassifier.TextClassifier);
}
@@ -51900,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;
@@ -51911,20 +51905,6 @@ package android.view.textclassifier {
field public static final java.lang.String TYPE_URL = "url";
}
public final class TextLanguage {
method public float getConfidenceScore(java.util.Locale);
method public int getEndIndex();
method public java.util.Locale getLanguage(int);
method public int getLanguageCount();
method public int getStartIndex();
}
public static final class TextLanguage.Builder {
ctor public TextLanguage.Builder(int, int);
method public android.view.textclassifier.TextLanguage build();
method public android.view.textclassifier.TextLanguage.Builder setLanguage(java.util.Locale, float);
}
public final class TextSelection {
method public float getConfidenceScore(java.lang.String);
method public java.lang.String getEntity(int);

20
api/test-current.txt
View File

@@ -48681,12 +48681,7 @@ 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 java.util.List<android.view.textclassifier.TextLanguage> detectLanguages(java.lang.CharSequence);
method public android.view.textclassifier.TextClassifier getTextClassifier();
method public void setTextClassifier(android.view.textclassifier.TextClassifier);
}
@@ -48714,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;
@@ -48725,20 +48719,6 @@ package android.view.textclassifier {
field public static final java.lang.String TYPE_URL = "url";
}
public final class TextLanguage {
method public float getConfidenceScore(java.util.Locale);
method public int getEndIndex();
method public java.util.Locale getLanguage(int);
method public int getLanguageCount();
method public int getStartIndex();
}
public static final class TextLanguage.Builder {
ctor public TextLanguage.Builder(int, int);
method public android.view.textclassifier.TextLanguage build();
method public android.view.textclassifier.TextLanguage.Builder setLanguage(java.util.Locale, float);
}
public final class TextSelection {
method public float getConfidenceScore(java.lang.String);
method public java.lang.String getEntity(int);

1
core/java/android/view/textclassifier/LinksInfo.java
View File

@@ -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
core/java/android/view/textclassifier/TextClassificationManager.java
View File

@@ -82,6 +82,7 @@ public final class TextClassificationManager {
* This is a blocking operation you should avoid calling it on the UI thread.
*
* @throws IllegalArgumentException if text is null
* @hide
*/
public List<TextLanguage> detectLanguages(@NonNull CharSequence text) {
Preconditions.checkArgument(text != null);

1
core/java/android/view/textclassifier/TextClassifier.java
View File

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

1
core/java/android/view/textclassifier/TextLanguage.java
View File

@@ -28,6 +28,7 @@ import java.util.Locale;
/**
* Specifies detected languages for a section of text indicated by a start and end index.
* @hide
*/
public final class TextLanguage {