Merge "Introduce TextClassificationManager." (cf4d2ce3) · Commits · e / os / android_frameworks_base

api/current.txt

+14 −0

Original line number	Diff line number	Diff line
		@@ -8385,6 +8385,7 @@ package android.content {
		field public static final java.lang.String TELECOM_SERVICE = "telecom";
		field public static final java.lang.String TELEPHONY_SERVICE = "phone";
		field public static final java.lang.String TELEPHONY_SUBSCRIPTION_SERVICE = "telephony_subscription_service";
		field public static final java.lang.String TEXT_CLASSIFICATION_SERVICE = "textclassification";
		field public static final java.lang.String TEXT_SERVICES_MANAGER_SERVICE = "textservices";
		field public static final java.lang.String TV_INPUT_SERVICE = "tv_input";
		field public static final java.lang.String UI_MODE_SERVICE = "uimode";
		@@ -39244,6 +39245,12 @@ package android.text {
		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);
		@@ -39259,6 +39266,13 @@ 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);

api/system-current.txt

+14 −0

Original line number	Diff line number	Diff line
		@@ -8731,6 +8731,7 @@ package android.content {
		field public static final java.lang.String TELECOM_SERVICE = "telecom";
		field public static final java.lang.String TELEPHONY_SERVICE = "phone";
		field public static final java.lang.String TELEPHONY_SUBSCRIPTION_SERVICE = "telephony_subscription_service";
		field public static final java.lang.String TEXT_CLASSIFICATION_SERVICE = "textclassification";
		field public static final java.lang.String TEXT_SERVICES_MANAGER_SERVICE = "textservices";
		field public static final java.lang.String TV_INPUT_SERVICE = "tv_input";
		field public static final java.lang.String UI_MODE_SERVICE = "uimode";
		@@ -42432,6 +42433,12 @@ package android.text {
		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);
		@@ -42447,6 +42454,13 @@ 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);

api/test-current.txt

+14 −0

Original line number	Diff line number	Diff line
		@@ -8409,6 +8409,7 @@ package android.content {
		field public static final java.lang.String TELECOM_SERVICE = "telecom";
		field public static final java.lang.String TELEPHONY_SERVICE = "phone";
		field public static final java.lang.String TELEPHONY_SUBSCRIPTION_SERVICE = "telephony_subscription_service";
		field public static final java.lang.String TEXT_CLASSIFICATION_SERVICE = "textclassification";
		field public static final java.lang.String TEXT_SERVICES_MANAGER_SERVICE = "textservices";
		field public static final java.lang.String TV_INPUT_SERVICE = "tv_input";
		field public static final java.lang.String UI_MODE_SERVICE = "uimode";
		@@ -39343,6 +39344,12 @@ package android.text {
		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);
		@@ -39358,6 +39365,13 @@ 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);

core/java/android/app/Activity.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -75,6 +75,7 @@ import android.service.autofill.IAutoFillCallback;
		import android.text.Selection;
		import android.text.SpannableStringBuilder;
		import android.text.TextAssistant;
		import android.text.TextClassificationManager;
		import android.text.TextUtils;
		import android.text.method.TextKeyListener;
		import android.transition.Scene;
		@@ -1402,7 +1403,7 @@ public class Activity extends ContextThemeWrapper
		if (mTextAssistant != null) {
		return mTextAssistant;
		}
		return TextAssistant.NO_OP;
		return getSystemService(TextClassificationManager.class);
		}

		/**

core/java/android/app/SystemServiceRegistry.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -115,6 +115,7 @@ import android.telecom.TelecomManager;
		import android.telephony.CarrierConfigManager;
		import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyManager;
		import android.text.TextClassificationManager;
		import android.util.Log;
		import android.view.ContextThemeWrapper;
		import android.view.LayoutInflater;
		@@ -221,6 +222,13 @@ final class SystemServiceRegistry {
		return new HdmiControlManager(IHdmiControlService.Stub.asInterface(b));
		}});

		registerService(Context.TEXT_CLASSIFICATION_SERVICE, TextClassificationManager.class,
		new StaticServiceFetcher<TextClassificationManager>() {
		@Override
		public TextClassificationManager createService() {
		return new TextClassificationManager();
		}});

		registerService(Context.CLIPBOARD_SERVICE, ClipboardManager.class,
		new CachedServiceFetcher<ClipboardManager>() {
		@Override