diff options
| author | 2017-03-30 19:30:38 +0000 | |
|---|---|---|
| committer | 2017-03-30 19:30:38 +0000 | |
| commit | d574c6765438a6be21323b563d6c7a31f3e8b79f (patch) | |
| tree | 7519e915f4dfa201a8be40d83cf971d3d50924eb | |
| parent | bf01a9d14fa7620ccfc04a5db84d9cd8f03df906 (diff) | |
| parent | 04312b25500f6f107f394675b1e374aac83006e2 (diff) | |
Merge "Hide TextClassifier.EntityType from the public API." into oc-dev am: 7600925263
am: 04312b2550
Change-Id: Ie26c2d636891e62be8f89d08429b53226c60e4b0
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | api/system-current.txt | 3 | ||||
| -rw-r--r-- | api/test-current.txt | 3 | ||||
| -rw-r--r-- | core/java/android/view/textclassifier/TextClassifier.java | 3 |
4 files changed, 2 insertions, 10 deletions
diff --git a/api/current.txt b/api/current.txt index f4db2817c0a3..4a718ae4e77d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -48122,9 +48122,6 @@ package android.view.textclassifier { field public static final java.lang.String TYPE_URL = "url"; } - public static abstract class TextClassifier.EntityType implements java.lang.annotation.Annotation { - } - public final class TextLanguage { method public float getConfidenceScore(java.util.Locale); method public int getEndIndex(); diff --git a/api/system-current.txt b/api/system-current.txt index fd2140b1c32e..2686058fe491 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -51612,9 +51612,6 @@ package android.view.textclassifier { field public static final java.lang.String TYPE_URL = "url"; } - public static abstract class TextClassifier.EntityType implements java.lang.annotation.Annotation { - } - public final class TextLanguage { method public float getConfidenceScore(java.util.Locale); method public int getEndIndex(); diff --git a/api/test-current.txt b/api/test-current.txt index bee9cb31efb5..593a83a5188f 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -48505,9 +48505,6 @@ package android.view.textclassifier { field public static final java.lang.String TYPE_URL = "url"; } - public static abstract class TextClassifier.EntityType implements java.lang.annotation.Annotation { - } - public final class TextLanguage { method public float getConfidenceScore(java.util.Locale); method public int getEndIndex(); diff --git a/core/java/android/view/textclassifier/TextClassifier.java b/core/java/android/view/textclassifier/TextClassifier.java index dabbf31d8f96..0831e20101b2 100644 --- a/core/java/android/view/textclassifier/TextClassifier.java +++ b/core/java/android/view/textclassifier/TextClassifier.java @@ -39,9 +39,10 @@ public interface TextClassifier { String TYPE_ADDRESS = "address"; String TYPE_URL = "url"; + /** @hide */ @Retention(RetentionPolicy.SOURCE) @StringDef({ - TYPE_OTHER, TYPE_EMAIL, TYPE_PHONE, TYPE_ADDRESS + TYPE_OTHER, TYPE_EMAIL, TYPE_PHONE, TYPE_ADDRESS, TYPE_URL }) @interface EntityType {} |