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

Commit 8c93e2b2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Introduce EXTRA_FROM_TEXT_CLASSIFIER"

parents 0e2372d4 c5a4612f

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -52758,6 +52758,7 @@ package android.view.textclassifier { 
    method public default android.view.textclassifier.ConversationActions suggestConversationActions(android.view.textclassifier.ConversationActions.Request);

    method public default android.view.textclassifier.TextSelection suggestSelection(android.view.textclassifier.TextSelection.Request);

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

    field public static final java.lang.String EXTRA_FROM_TEXT_CLASSIFIER = "android.view.textclassifier.extra.FROM_TEXT_CLASSIFIER";

    field public static final java.lang.String HINT_TEXT_IS_EDITABLE = "android.text_is_editable";

    field public static final java.lang.String HINT_TEXT_IS_NOT_EDITABLE = "android.text_is_not_editable";

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

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

+8 −0
Original line number Diff line number Diff line
@@ -161,6 +161,14 @@ public interface TextClassifier { 
     */

    TextClassifier NO_OP = new TextClassifier() {};



    /**

     * Used as a boolean value to indicate the intent is generated by TextClassifier.

     * <p>

     * All {@link TextClassifier} implementations should set this boolean extra to be true in their

     * generated intents.

     */

    String EXTRA_FROM_TEXT_CLASSIFIER = "android.view.textclassifier.extra.FROM_TEXT_CLASSIFIER";



    /**

     * Returns suggested text selection start and end indices, recognized entity types, and their

     * associated confidence scores. The entity types are ordered from highest to lowest scoring.

core/java/android/view/textclassifier/TextClassifierImpl.java

+4 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ public final class TextClassifierImpl implements TextClassifier { 
                        FACTORY_MODEL_DIR,

                        LANG_ID_FACTORY_MODEL_FILENAME_REGEX,

                        UPDATED_LANG_ID_MODEL_FILE,

                        fd -> -1, // TODO: Replace this with LangIdModel.getVersion(fd)

                        LangIdModel::getVersion,

                        fd -> ModelFileManager.ModelFile.LANGUAGE_INDEPENDENT));

        mActionsModelFileManager = new ModelFileManager(

                new ModelFileManager.ModelFileSupplierImpl(
@@ -798,6 +798,9 @@ public final class TextClassifierImpl implements TextClassifier { 
            if (foreignText) {

                insertTranslateAction(actions, context, text);

            }

            actions.forEach(

                    action -> action.getIntent()

                            .putExtra(TextClassifier.EXTRA_FROM_TEXT_CLASSIFIER, true));

            return actions;

        }

core/tests/coretests/src/android/view/textclassifier/IntentFactoryTest.java

+2 −0
Original line number Diff line number Diff line
@@ -56,5 +56,7 @@ public class IntentFactoryTest { 
        Intent intent = labeledIntent.getIntent();

        assertThat(intent.getAction()).isEqualTo(Intent.ACTION_DEFINE);

        assertThat(intent.getStringExtra(Intent.EXTRA_TEXT)).isEqualTo(TEXT);

        assertThat(

                intent.getBooleanExtra(TextClassifier.EXTRA_FROM_TEXT_CLASSIFIER, false)).isTrue();

    }

}