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

Commit 1f50fa6d authored by Abodunrinwa Toki's avatar Abodunrinwa Toki Committed by Android (Google) Code Review
Browse files

Merge "Update TextAssistant interface."

parents 38124460 f001feff

api/current.txt

+80 −34
Original line number Diff line number Diff line
@@ -1817,6 +1817,7 @@ package android { 
    field public static final int tabs = 16908307; // 0x1020013

    field public static final int text1 = 16908308; // 0x1020014

    field public static final int text2 = 16908309; // 0x1020015

    field public static final int textAssist = 16908353; // 0x1020041

    field public static final int title = 16908310; // 0x1020016

    field public static final int toggle = 16908311; // 0x1020017

    field public static final int undo = 16908338; // 0x1020032
@@ -3536,7 +3537,6 @@ package android.app { 
    method public int getRequestedOrientation();

    method public final android.view.SearchEvent getSearchEvent();

    method public int getTaskId();

    method public android.text.TextAssistant getTextAssistant();

    method public final java.lang.CharSequence getTitle();

    method public final int getTitleColor();

    method public android.app.VoiceInteractor getVoiceInteractor();
@@ -3686,7 +3686,6 @@ package android.app { 
    method public final void setResult(int, android.content.Intent);

    method public final deprecated void setSecondaryProgress(int);

    method public void setTaskDescription(android.app.ActivityManager.TaskDescription);

    method public void setTextAssistant(android.text.TextAssistant);

    method public void setTitle(java.lang.CharSequence);

    method public void setTitle(int);

    method public deprecated void setTitleColor(int);
@@ -39925,22 +39924,6 @@ package android.text { 
    method public android.text.StaticLayout.Builder setTextDirection(android.text.TextDirectionHeuristic);

  }













  public abstract interface TextAssistant {













    method public abstract void addLinks(android.text.Spannable, int);













    method public abstract android.text.TextSelection suggestSelection(java.lang.CharSequence, int, int);













  }

























  public class TextClassification {













    ctor public TextClassification();













    method public java.util.Map<java.lang.String, java.lang.Float> getTypeConfidence();













  }

























  public final class TextClassificationManager implements android.text.TextAssistant {













    method public void addLinks(android.text.Spannable, int);













    method public java.util.List<android.text.TextLanguage> detectLanguages(java.lang.CharSequence);













    method public android.text.TextSelection suggestSelection(java.lang.CharSequence, int, int);













  }



























  public abstract interface TextDirectionHeuristic {















    method public abstract boolean isRtl(char[], int, int);















    method public abstract boolean isRtl(java.lang.CharSequence, int, int);









@@ -39956,13 +39939,6 @@ package android.text {













    field public static final android.text.TextDirectionHeuristic RTL;















  }



























  public final class TextLanguage {













    ctor public TextLanguage(int, int, java.util.Map<java.lang.String, java.lang.Float>);













    method public int getEndIndex();













    method public java.util.Map<java.lang.String, java.lang.Float> getLanguageConfidence();













    method public int getStartIndex();













  }



























  public class TextPaint extends android.graphics.Paint {















    ctor public TextPaint();















    ctor public TextPaint(int);









@@ -39975,13 +39951,6 @@ package android.text {













    field public int linkColor;















  }



























  public class TextSelection {













    ctor public TextSelection();













    method public int getSelectionEndIndex();













    method public int getSelectionStartIndex();













    method public android.text.TextClassification getTextClassification();













  }



























  public class TextUtils {















    method public static deprecated java.lang.CharSequence commaEllipsize(java.lang.CharSequence, android.text.TextPaint, float, java.lang.String, java.lang.String);















    method public static java.lang.CharSequence concat(java.lang.CharSequence...);










@@ -46493,6 +46462,83 @@ 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 getDefaultTextClassifier();













  }

























  public final class TextClassificationResult {













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













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













    method public int getEntityCount();













    method public android.graphics.drawable.Drawable getIcon();













    method public android.content.Intent getIntent();













    method public java.lang.CharSequence getLabel();













    method public android.view.View.OnClickListener getOnClickListener();













    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 abstract interface TextClassifier {













    method public abstract android.view.textclassifier.LinksInfo getLinks(java.lang.CharSequence, int);













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













    method public abstract android.view.textclassifier.TextSelection suggestSelection(java.lang.CharSequence, int, int);













    field public static final android.view.textclassifier.TextClassifier NO_OP;













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













    field public static final java.lang.String TYPE_EMAIL = "email";













    field public static final java.lang.String TYPE_OTHER = "other";













    field public static final java.lang.String TYPE_PHONE = "phone";













  }

























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













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













    method public int getEntityCount();













    method public int getSelectionEndIndex();













    method public int getSelectionStartIndex();













  }

























  public static final class TextSelection.Builder {













    ctor public TextSelection.Builder(int, int);













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













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













  }

























}



























package android.view.textservice {





























  public final class SentenceSuggestionsInfo implements android.os.Parcelable {










@@ -49582,7 +49628,7 @@ package android.widget {













    method public float getShadowRadius();















    method public final boolean getShowSoftInputOnFocus();















    method public java.lang.CharSequence getText();













    method public android.text.TextAssistant getTextAssistant();













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















    method public final android.content.res.ColorStateList getTextColors();















    method public java.util.Locale getTextLocale();















    method public android.os.LocaleList getTextLocales();










@@ -49698,7 +49744,7 @@ package android.widget {













    method public final void setText(int, android.widget.TextView.BufferType);















    method public void setTextAppearance(int);















    method public deprecated void setTextAppearance(android.content.Context, int);













    method public void setTextAssistant(android.text.TextAssistant);













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















    method public void setTextColor(int);















    method public void setTextColor(android.content.res.ColorStateList);















    method public void setTextIsSelectable(boolean);

























api/system-current.txt



+80
−34




























Original line number
Diff line number
Diff line








@@ -1930,6 +1930,7 @@ package android {













    field public static final int tabs = 16908307; // 0x1020013















    field public static final int text1 = 16908308; // 0x1020014















    field public static final int text2 = 16908309; // 0x1020015













    field public static final int textAssist = 16908353; // 0x1020041















    field public static final int title = 16908310; // 0x1020016















    field public static final int toggle = 16908311; // 0x1020017















    field public static final int undo = 16908338; // 0x1020032










@@ -3655,7 +3656,6 @@ package android.app {













    method public int getRequestedOrientation();















    method public final android.view.SearchEvent getSearchEvent();















    method public int getTaskId();













    method public android.text.TextAssistant getTextAssistant();















    method public final java.lang.CharSequence getTitle();















    method public final int getTitleColor();















    method public android.app.VoiceInteractor getVoiceInteractor();










@@ -3807,7 +3807,6 @@ package android.app {













    method public final void setResult(int, android.content.Intent);















    method public final deprecated void setSecondaryProgress(int);















    method public void setTaskDescription(android.app.ActivityManager.TaskDescription);













    method public void setTextAssistant(android.text.TextAssistant);















    method public void setTitle(java.lang.CharSequence);















    method public void setTitle(int);















    method public deprecated void setTitleColor(int);










@@ -43228,22 +43227,6 @@ package android.text {













    method public android.text.StaticLayout.Builder setTextDirection(android.text.TextDirectionHeuristic);















  }



























  public abstract interface TextAssistant {













    method public abstract void addLinks(android.text.Spannable, int);













    method public abstract android.text.TextSelection suggestSelection(java.lang.CharSequence, int, int);













  }

























  public class TextClassification {













    ctor public TextClassification();













    method public java.util.Map<java.lang.String, java.lang.Float> getTypeConfidence();













  }

























  public final class TextClassificationManager implements android.text.TextAssistant {













    method public void addLinks(android.text.Spannable, int);













    method public java.util.List<android.text.TextLanguage> detectLanguages(java.lang.CharSequence);













    method public android.text.TextSelection suggestSelection(java.lang.CharSequence, int, int);













  }



























  public abstract interface TextDirectionHeuristic {















    method public abstract boolean isRtl(char[], int, int);















    method public abstract boolean isRtl(java.lang.CharSequence, int, int);









@@ -43259,13 +43242,6 @@ package android.text {













    field public static final android.text.TextDirectionHeuristic RTL;















  }



























  public final class TextLanguage {













    ctor public TextLanguage(int, int, java.util.Map<java.lang.String, java.lang.Float>);













    method public int getEndIndex();













    method public java.util.Map<java.lang.String, java.lang.Float> getLanguageConfidence();













    method public int getStartIndex();













  }



























  public class TextPaint extends android.graphics.Paint {















    ctor public TextPaint();















    ctor public TextPaint(int);









@@ -43278,13 +43254,6 @@ package android.text {













    field public int linkColor;















  }



























  public class TextSelection {













    ctor public TextSelection();













    method public int getSelectionEndIndex();













    method public int getSelectionStartIndex();













    method public android.text.TextClassification getTextClassification();













  }



























  public class TextUtils {















    method public static deprecated java.lang.CharSequence commaEllipsize(java.lang.CharSequence, android.text.TextPaint, float, java.lang.String, java.lang.String);















    method public static java.lang.CharSequence concat(java.lang.CharSequence...);










@@ -49800,6 +49769,83 @@ 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 getDefaultTextClassifier();













  }

























  public final class TextClassificationResult {













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













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













    method public int getEntityCount();













    method public android.graphics.drawable.Drawable getIcon();













    method public android.content.Intent getIntent();













    method public java.lang.CharSequence getLabel();













    method public android.view.View.OnClickListener getOnClickListener();













    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 abstract interface TextClassifier {













    method public abstract android.view.textclassifier.LinksInfo getLinks(java.lang.CharSequence, int);













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













    method public abstract android.view.textclassifier.TextSelection suggestSelection(java.lang.CharSequence, int, int);













    field public static final android.view.textclassifier.TextClassifier NO_OP;













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













    field public static final java.lang.String TYPE_EMAIL = "email";













    field public static final java.lang.String TYPE_OTHER = "other";













    field public static final java.lang.String TYPE_PHONE = "phone";













  }

























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













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













    method public int getEntityCount();













    method public int getSelectionEndIndex();













    method public int getSelectionStartIndex();













  }

























  public static final class TextSelection.Builder {













    ctor public TextSelection.Builder(int, int);













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













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













  }

























}



























package android.view.textservice {





























  public final class SentenceSuggestionsInfo implements android.os.Parcelable {










@@ -53250,7 +53296,7 @@ package android.widget {













    method public float getShadowRadius();















    method public final boolean getShowSoftInputOnFocus();















    method public java.lang.CharSequence getText();













    method public android.text.TextAssistant getTextAssistant();













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















    method public final android.content.res.ColorStateList getTextColors();















    method public java.util.Locale getTextLocale();















    method public android.os.LocaleList getTextLocales();










@@ -53366,7 +53412,7 @@ package android.widget {













    method public final void setText(int, android.widget.TextView.BufferType);















    method public void setTextAppearance(int);















    method public deprecated void setTextAppearance(android.content.Context, int);













    method public void setTextAssistant(android.text.TextAssistant);













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















    method public void setTextColor(int);















    method public void setTextColor(android.content.res.ColorStateList);















    method public void setTextIsSelectable(boolean);

























api/test-current.txt



+80
−34




























Original line number
Diff line number
Diff line








@@ -1817,6 +1817,7 @@ package android {













    field public static final int tabs = 16908307; // 0x1020013















    field public static final int text1 = 16908308; // 0x1020014















    field public static final int text2 = 16908309; // 0x1020015













    field public static final int textAssist = 16908353; // 0x1020041















    field public static final int title = 16908310; // 0x1020016















    field public static final int toggle = 16908311; // 0x1020017















    field public static final int undo = 16908338; // 0x1020032










@@ -3538,7 +3539,6 @@ package android.app {













    method public int getRequestedOrientation();















    method public final android.view.SearchEvent getSearchEvent();















    method public int getTaskId();













    method public android.text.TextAssistant getTextAssistant();















    method public final java.lang.CharSequence getTitle();















    method public final int getTitleColor();















    method public android.app.VoiceInteractor getVoiceInteractor();










@@ -3688,7 +3688,6 @@ package android.app {













    method public final void setResult(int, android.content.Intent);















    method public final deprecated void setSecondaryProgress(int);















    method public void setTaskDescription(android.app.ActivityManager.TaskDescription);













    method public void setTextAssistant(android.text.TextAssistant);















    method public void setTitle(java.lang.CharSequence);















    method public void setTitle(int);















    method public deprecated void setTitleColor(int);










@@ -40049,22 +40048,6 @@ package android.text {













    method public android.text.StaticLayout.Builder setTextDirection(android.text.TextDirectionHeuristic);















  }



























  public abstract interface TextAssistant {













    method public abstract void addLinks(android.text.Spannable, int);













    method public abstract android.text.TextSelection suggestSelection(java.lang.CharSequence, int, int);













  }

























  public class TextClassification {













    ctor public TextClassification();













    method public java.util.Map<java.lang.String, java.lang.Float> getTypeConfidence();













  }

























  public final class TextClassificationManager implements android.text.TextAssistant {













    method public void addLinks(android.text.Spannable, int);













    method public java.util.List<android.text.TextLanguage> detectLanguages(java.lang.CharSequence);













    method public android.text.TextSelection suggestSelection(java.lang.CharSequence, int, int);













  }



























  public abstract interface TextDirectionHeuristic {















    method public abstract boolean isRtl(char[], int, int);















    method public abstract boolean isRtl(java.lang.CharSequence, int, int);









@@ -40080,13 +40063,6 @@ package android.text {













    field public static final android.text.TextDirectionHeuristic RTL;















  }



























  public final class TextLanguage {













    ctor public TextLanguage(int, int, java.util.Map<java.lang.String, java.lang.Float>);













    method public int getEndIndex();













    method public java.util.Map<java.lang.String, java.lang.Float> getLanguageConfidence();













    method public int getStartIndex();













  }



























  public class TextPaint extends android.graphics.Paint {















    ctor public TextPaint();















    ctor public TextPaint(int);









@@ -40099,13 +40075,6 @@ package android.text {













    field public int linkColor;















  }



























  public class TextSelection {













    ctor public TextSelection();













    method public int getSelectionEndIndex();













    method public int getSelectionStartIndex();













    method public android.text.TextClassification getTextClassification();













  }



























  public class TextUtils {















    method public static deprecated java.lang.CharSequence commaEllipsize(java.lang.CharSequence, android.text.TextPaint, float, java.lang.String, java.lang.String);















    method public static java.lang.CharSequence concat(java.lang.CharSequence...);










@@ -46791,6 +46760,83 @@ 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 getDefaultTextClassifier();













  }

























  public final class TextClassificationResult {













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













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













    method public int getEntityCount();













    method public android.graphics.drawable.Drawable getIcon();













    method public android.content.Intent getIntent();













    method public java.lang.CharSequence getLabel();













    method public android.view.View.OnClickListener getOnClickListener();













    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 abstract interface TextClassifier {













    method public abstract android.view.textclassifier.LinksInfo getLinks(java.lang.CharSequence, int);













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













    method public abstract android.view.textclassifier.TextSelection suggestSelection(java.lang.CharSequence, int, int);













    field public static final android.view.textclassifier.TextClassifier NO_OP;













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













    field public static final java.lang.String TYPE_EMAIL = "email";













    field public static final java.lang.String TYPE_OTHER = "other";













    field public static final java.lang.String TYPE_PHONE = "phone";













  }

























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













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













    method public int getEntityCount();













    method public int getSelectionEndIndex();













    method public int getSelectionStartIndex();













  }

























  public static final class TextSelection.Builder {













    ctor public TextSelection.Builder(int, int);













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













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













  }

























}



























package android.view.textservice {





























  public final class SentenceSuggestionsInfo implements android.os.Parcelable {










@@ -49887,7 +49933,7 @@ package android.widget {













    method public float getShadowRadius();















    method public final boolean getShowSoftInputOnFocus();















    method public java.lang.CharSequence getText();













    method public android.text.TextAssistant getTextAssistant();













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















    method public final android.content.res.ColorStateList getTextColors();















    method public java.util.Locale getTextLocale();















    method public android.os.LocaleList getTextLocales();










@@ -50003,7 +50049,7 @@ package android.widget {













    method public final void setText(int, android.widget.TextView.BufferType);















    method public void setTextAppearance(int);















    method public deprecated void setTextAppearance(android.content.Context, int);













    method public void setTextAssistant(android.text.TextAssistant);













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















    method public void setTextColor(int);















    method public void setTextColor(android.content.res.ColorStateList);















    method public void setTextIsSelectable(boolean);

























core/java/android/app/Activity.java



+0
−22


























File changed.
Preview size limit exceeded, changes collapsed.
























core/java/android/app/SystemServiceRegistry.java



+4
−4


























File changed.
Preview size limit exceeded, changes collapsed.