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

Commit e0b57893 authored by Abodunrinwa Toki's avatar Abodunrinwa Toki
Browse files

TextClassifier: API rename 

 getTextClassificationResult() -> classifyText()
 TextClassificationResult -> TextClassification

Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Bug: 37769880
Change-Id: I2d926e89058babf06bcff390bee3a45e965984e8
parent 2d5c0d89

api/current.txt

+16 −16
Original line number Diff line number Diff line
@@ -48212,12 +48212,7 @@ package android.view.inputmethod { 














package android.view.textclassifier {



























  public final class TextClassificationManager {













    method public android.view.textclassifier.TextClassifier getTextClassifier();













    method public void setTextClassifier(android.view.textclassifier.TextClassifier);













  }

























  public final class TextClassificationResult {













  public final class TextClassification {















    method public float getConfidenceScore(java.lang.String);















    method public java.lang.String getEntity(int);















    method public int getEntityCount();









@@ -48228,19 +48223,24 @@ package android.view.textclassifier {













    method public java.lang.String getText();















  }



























  public static final class TextClassificationResult.Builder {













    ctor public TextClassificationResult.Builder();













    method public android.view.textclassifier.TextClassificationResult build();













    method public android.view.textclassifier.TextClassificationResult.Builder setEntityType(java.lang.String, float);













    method public android.view.textclassifier.TextClassificationResult.Builder setIcon(android.graphics.drawable.Drawable);













    method public android.view.textclassifier.TextClassificationResult.Builder setIntent(android.content.Intent);













    method public android.view.textclassifier.TextClassificationResult.Builder setLabel(java.lang.String);













    method public android.view.textclassifier.TextClassificationResult.Builder setOnClickListener(android.view.View.OnClickListener);













    method public android.view.textclassifier.TextClassificationResult.Builder setText(java.lang.String);













  public static final class TextClassification.Builder {













    ctor public TextClassification.Builder();













    method public android.view.textclassifier.TextClassification build();













    method public android.view.textclassifier.TextClassification.Builder setEntityType(java.lang.String, float);













    method public android.view.textclassifier.TextClassification.Builder setIcon(android.graphics.drawable.Drawable);













    method public android.view.textclassifier.TextClassification.Builder setIntent(android.content.Intent);













    method public android.view.textclassifier.TextClassification.Builder setLabel(java.lang.String);













    method public android.view.textclassifier.TextClassification.Builder setOnClickListener(android.view.View.OnClickListener);













    method public android.view.textclassifier.TextClassification.Builder setText(java.lang.String);













  }

























  public final class TextClassificationManager {













    method public android.view.textclassifier.TextClassifier getTextClassifier();













    method public void setTextClassifier(android.view.textclassifier.TextClassifier);















  }





























  public abstract interface TextClassifier {













    method public abstract android.view.textclassifier.TextClassificationResult getTextClassificationResult(java.lang.CharSequence, int, int, android.os.LocaleList);













    method public abstract android.view.textclassifier.TextClassification classifyText(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;















    field public static final java.lang.String TYPE_ADDRESS = "address";

























api/system-current.txt



+16
−16




























Original line number
Diff line number
Diff line








@@ -51800,12 +51800,7 @@ package android.view.inputmethod {



























package android.view.textclassifier {



























  public final class TextClassificationManager {













    method public android.view.textclassifier.TextClassifier getTextClassifier();













    method public void setTextClassifier(android.view.textclassifier.TextClassifier);













  }

























  public final class TextClassificationResult {













  public final class TextClassification {















    method public float getConfidenceScore(java.lang.String);















    method public java.lang.String getEntity(int);















    method public int getEntityCount();









@@ -51816,19 +51811,24 @@ package android.view.textclassifier {













    method public java.lang.String getText();















  }



























  public static final class TextClassificationResult.Builder {













    ctor public TextClassificationResult.Builder();













    method public android.view.textclassifier.TextClassificationResult build();













    method public android.view.textclassifier.TextClassificationResult.Builder setEntityType(java.lang.String, float);













    method public android.view.textclassifier.TextClassificationResult.Builder setIcon(android.graphics.drawable.Drawable);













    method public android.view.textclassifier.TextClassificationResult.Builder setIntent(android.content.Intent);













    method public android.view.textclassifier.TextClassificationResult.Builder setLabel(java.lang.String);













    method public android.view.textclassifier.TextClassificationResult.Builder setOnClickListener(android.view.View.OnClickListener);













    method public android.view.textclassifier.TextClassificationResult.Builder setText(java.lang.String);













  public static final class TextClassification.Builder {













    ctor public TextClassification.Builder();













    method public android.view.textclassifier.TextClassification build();













    method public android.view.textclassifier.TextClassification.Builder setEntityType(java.lang.String, float);













    method public android.view.textclassifier.TextClassification.Builder setIcon(android.graphics.drawable.Drawable);













    method public android.view.textclassifier.TextClassification.Builder setIntent(android.content.Intent);













    method public android.view.textclassifier.TextClassification.Builder setLabel(java.lang.String);













    method public android.view.textclassifier.TextClassification.Builder setOnClickListener(android.view.View.OnClickListener);













    method public android.view.textclassifier.TextClassification.Builder setText(java.lang.String);













  }

























  public final class TextClassificationManager {













    method public android.view.textclassifier.TextClassifier getTextClassifier();













    method public void setTextClassifier(android.view.textclassifier.TextClassifier);















  }





























  public abstract interface TextClassifier {













    method public abstract android.view.textclassifier.TextClassificationResult getTextClassificationResult(java.lang.CharSequence, int, int, android.os.LocaleList);













    method public abstract android.view.textclassifier.TextClassification classifyText(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;















    field public static final java.lang.String TYPE_ADDRESS = "address";

























api/test-current.txt



+16
−16




























Original line number
Diff line number
Diff line








@@ -48591,12 +48591,7 @@ package android.view.inputmethod {



























package android.view.textclassifier {



























  public final class TextClassificationManager {













    method public android.view.textclassifier.TextClassifier getTextClassifier();













    method public void setTextClassifier(android.view.textclassifier.TextClassifier);













  }

























  public final class TextClassificationResult {













  public final class TextClassification {















    method public float getConfidenceScore(java.lang.String);















    method public java.lang.String getEntity(int);















    method public int getEntityCount();









@@ -48607,19 +48602,24 @@ package android.view.textclassifier {













    method public java.lang.String getText();















  }



























  public static final class TextClassificationResult.Builder {













    ctor public TextClassificationResult.Builder();













    method public android.view.textclassifier.TextClassificationResult build();













    method public android.view.textclassifier.TextClassificationResult.Builder setEntityType(java.lang.String, float);













    method public android.view.textclassifier.TextClassificationResult.Builder setIcon(android.graphics.drawable.Drawable);













    method public android.view.textclassifier.TextClassificationResult.Builder setIntent(android.content.Intent);













    method public android.view.textclassifier.TextClassificationResult.Builder setLabel(java.lang.String);













    method public android.view.textclassifier.TextClassificationResult.Builder setOnClickListener(android.view.View.OnClickListener);













    method public android.view.textclassifier.TextClassificationResult.Builder setText(java.lang.String);













  public static final class TextClassification.Builder {













    ctor public TextClassification.Builder();













    method public android.view.textclassifier.TextClassification build();













    method public android.view.textclassifier.TextClassification.Builder setEntityType(java.lang.String, float);













    method public android.view.textclassifier.TextClassification.Builder setIcon(android.graphics.drawable.Drawable);













    method public android.view.textclassifier.TextClassification.Builder setIntent(android.content.Intent);













    method public android.view.textclassifier.TextClassification.Builder setLabel(java.lang.String);













    method public android.view.textclassifier.TextClassification.Builder setOnClickListener(android.view.View.OnClickListener);













    method public android.view.textclassifier.TextClassification.Builder setText(java.lang.String);













  }

























  public final class TextClassificationManager {













    method public android.view.textclassifier.TextClassifier getTextClassifier();













    method public void setTextClassifier(android.view.textclassifier.TextClassifier);















  }





























  public abstract interface TextClassifier {













    method public abstract android.view.textclassifier.TextClassificationResult getTextClassificationResult(java.lang.CharSequence, int, int, android.os.LocaleList);













    method public abstract android.view.textclassifier.TextClassification classifyText(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;















    field public static final java.lang.String TYPE_ADDRESS = "address";

























core/java/android/view/textclassifier/TextClassificationResult.java→core/java/android/view/textclassifier/TextClassification.java



+8
−8




























Original line number
Diff line number
Diff line








@@ -33,12 +33,12 @@ import java.util.List;













/**















 * Information for generating a widget to handle classified text.















 */













public final class TextClassificationResult {













public final class TextClassification {































    /**















     * @hide















     */













    static final TextClassificationResult EMPTY = new TextClassificationResult.Builder().build();













    static final TextClassification EMPTY = new TextClassification.Builder().build();































    @NonNull private final String mText;















    @Nullable private final Drawable mIcon;









@@ -49,7 +49,7 @@ public final class TextClassificationResult {













    @NonNull private final List<String> mEntities;















    private int mLogType;





























    private TextClassificationResult(













    private TextClassification(















            @NonNull String text,















            Drawable icon,















            String label,










@@ -147,7 +147,7 @@ public final class TextClassificationResult {





























    @Override















    public String toString() {













        return String.format("TextClassificationResult {"













        return String.format("TextClassification {"















                        + "text=%s, entities=%s, label=%s, intent=%s}",















                mText, mEntityConfidence, mLabel, mIntent);















    }









@@ -167,7 +167,7 @@ public final class TextClassificationResult {













    }































    /**













     * Builder for building {@link TextClassificationResult}s.













     * Builder for building {@link TextClassification} objects.















     */















    public static final class Builder {


























@@ -244,10 +244,10 @@ public final class TextClassificationResult {













        }































        /**













         * Builds an returns a {@link TextClassificationResult}.













         * Builds and returns a {@link TextClassification} object.















         */













        public TextClassificationResult build() {













            return new TextClassificationResult(













        public TextClassification build() {













            return new TextClassification(















                    mText, mIcon, mLabel, mIntent, mOnClickListener, mEntityConfidence, mLogType);















        }















    }

































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



+9
−5




























Original line number
Diff line number
Diff line








@@ -20,6 +20,7 @@ import android.annotation.IntRange;













import android.annotation.NonNull;















import android.annotation.Nullable;















import android.annotation.StringDef;













import android.annotation.WorkerThread;















import android.os.LocaleList;































import java.lang.annotation.Retention;










@@ -62,9 +63,9 @@ public interface TextClassifier {













        }































        @Override













        public TextClassificationResult getTextClassificationResult(













        public TextClassification classifyText(















                CharSequence text, int startIndex, int endIndex, LocaleList defaultLocales) {













            return TextClassificationResult.EMPTY;













            return TextClassification.EMPTY;















        }































        @Override









@@ -89,6 +90,7 @@ public interface TextClassifier {













     * @throws IllegalArgumentException if text is null; selectionStartIndex is negative;















     *      selectionEndIndex is greater than text.length() or not greater than selectionStartIndex















     */













    @WorkerThread















    @NonNull















    TextSelection suggestSelection(















            @NonNull CharSequence text,









@@ -97,8 +99,8 @@ public interface TextClassifier {













            @Nullable LocaleList defaultLocales);































    /**













     * Returns a {@link TextClassificationResult} object that can be used to generate a widget for













     * handling the classified text.













     * Classifies the specified text and returns a {@link TextClassification} object that can be













     * used to generate a widget for handling the classified text.















     *















     * @param text text providing context for the text to classify (which is specified















     *      by the sub sequence starting at startIndex and ending at endIndex)









@@ -112,8 +114,9 @@ public interface TextClassifier {













     * @throws IllegalArgumentException if text is null; startIndex is negative;















     *      endIndex is greater than text.length() or not greater than startIndex















     */













    @WorkerThread















    @NonNull













    TextClassificationResult getTextClassificationResult(













    TextClassification classifyText(















            @NonNull CharSequence text,















            @IntRange(from = 0) int startIndex,















            @IntRange(from = 0) int endIndex,









@@ -134,6 +137,7 @@ public interface TextClassifier {













     * @throws IllegalArgumentException if text is null















     * @hide















     */













    @WorkerThread















    LinksInfo getLinks(















            @NonNull CharSequence text, int linkMask, @Nullable LocaleList defaultLocales);















}