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
This commit is contained in:
Tony Mak
2019-03-22 13:35:40 +00:00
parent b8d4c59b08
commit 237f37b7f4
3 changed files with 20 additions and 7 deletions

View File

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

View File

@@ -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(),

View File

@@ -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(),