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

Commit 237f37b7 authored by Tony Mak's avatar Tony Mak
Browse files

Conversation Actions: support multiple models. 

This allows us to use the universal model when there is no model available for the
supported language.

Test: adb shell dumpsys textclassification. Observe that both en
      and univerisal actions model are listed properly.
Test: Switch to traditional chinese, observe that url action is working.

BUG: 128312720
Change-Id: I38258c8859e8ce505535ccf1f650ccf9daf64f46
parent b8d4c59b

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

+2 −1
Original line number Diff line number Diff line
@@ -86,7 +86,8 @@ public final class TextClassifierImpl implements TextClassifier { 
            new File("/data/misc/textclassifier/lang_id.model");



    // Actions

    private static final String ACTIONS_FACTORY_MODEL_FILENAME_REGEX = "actions_suggestions.model";

    private static final String ACTIONS_FACTORY_MODEL_FILENAME_REGEX =

            "actions_suggestions\\.(.*)\\.model";

    private static final File UPDATED_ACTIONS_MODEL =

            new File("/data/misc/textclassifier/actions_suggestions.model");

core/tests/coretests/src/android/view/textclassifier/intent/LegacyIntentClassificationFactoryTest.java

+6 −2
Original line number Diff line number Diff line
@@ -64,7 +64,9 @@ public class LegacyIntentClassificationFactoryTest { 
                        null,

                        null,

                        null,

                        null);

                        null,

                        0,

                        0);



        List<LabeledIntent> intents = mLegacyIntentClassificationFactory.create(

                InstrumentationRegistry.getContext(),
@@ -98,7 +100,9 @@ public class LegacyIntentClassificationFactoryTest { 
                        null,

                        null,

                        null,

                        null);

                        null,

                        0,

                        0);



        List<LabeledIntent> intents = mLegacyIntentClassificationFactory.create(

                InstrumentationRegistry.getContext(),

core/tests/coretests/src/android/view/textclassifier/intent/TemplateClassificationIntentFactoryTest.java

+12 −4
Original line number Diff line number Diff line
@@ -82,7 +82,9 @@ public class TemplateClassificationIntentFactoryTest { 
                        null,

                        null,

                        null,

                        createRemoteActionTemplates());

                        createRemoteActionTemplates(),

                        0,

                        0);



        List<LabeledIntent> intents =

                mTemplateClassificationIntentFactory.create(
@@ -121,7 +123,9 @@ public class TemplateClassificationIntentFactoryTest { 
                        null,

                        null,

                        null,

                        createRemoteActionTemplates());

                        createRemoteActionTemplates(),

                        0,

                        0);



        List<LabeledIntent> intents =

                mTemplateClassificationIntentFactory.create(
@@ -156,7 +160,9 @@ public class TemplateClassificationIntentFactoryTest { 
                        null,

                        null,

                        null,

                        null);

                        null,

                        0,

                        0);



        mTemplateClassificationIntentFactory.create(

                InstrumentationRegistry.getContext(),
@@ -189,7 +195,9 @@ public class TemplateClassificationIntentFactoryTest { 
                        null,

                        null,

                        null,

                        new RemoteActionTemplate[0]);

                        new RemoteActionTemplate[0],

                        0,

                        0);



        mTemplateClassificationIntentFactory.create(

                InstrumentationRegistry.getContext(),