summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tony Mak <tonymak@google.com> 2018-12-04 15:34:52 +0000
committer Tony Mak <tonymak@google.com> 2018-12-04 19:08:48 +0000
commit8508fbf5e23a596d8446f86d91cb14071ab6374c (patch)
tree0b324c22e8e26a89509fb1a50cd84c1842805f47
parentafafd66da28a3bf48ce63df5c8309600572ea2cc (diff)
Required change for the new model drop
Will pipe through the real data in the coming CL. Test: atest TextClassifierTest.java Change-Id: Ia23c0755dd01abc609349e2be0e8ec10014953f5
-rw-r--r--core/java/android/view/textclassifier/ActionsSuggestionsHelper.java6
-rw-r--r--core/tests/coretests/src/android/view/textclassifier/TextClassifierTest.java2
2 files changed, 5 insertions, 3 deletions
diff --git a/core/java/android/view/textclassifier/ActionsSuggestionsHelper.java b/core/java/android/view/textclassifier/ActionsSuggestionsHelper.java
index 8df83c0e5dff..797b861e9e70 100644
--- a/core/java/android/view/textclassifier/ActionsSuggestionsHelper.java
+++ b/core/java/android/view/textclassifier/ActionsSuggestionsHelper.java
@@ -76,7 +76,9 @@ public final class ActionsSuggestionsHelper {
return new ActionsSuggestionsModel.ConversationMessage[]{
new ActionsSuggestionsModel.ConversationMessage(
FIRST_NON_LOCAL_USER,
- lastMessage.getText().toString())};
+ lastMessage.getText().toString(),
+ 0,
+ null)};
}
// Encode the messages in the reverse order, stop whenever the Person object is missing.
@@ -89,7 +91,7 @@ public final class ActionsSuggestionsHelper {
}
nativeMessages.push(new ActionsSuggestionsModel.ConversationMessage(
personEncoder.encode(message.getAuthor()),
- message.getText().toString()));
+ message.getText().toString(), 0, null));
}
return nativeMessages.toArray(
new ActionsSuggestionsModel.ConversationMessage[nativeMessages.size()]);
diff --git a/core/tests/coretests/src/android/view/textclassifier/TextClassifierTest.java b/core/tests/coretests/src/android/view/textclassifier/TextClassifierTest.java
index fbcb629f043f..aec4571252e7 100644
--- a/core/tests/coretests/src/android/view/textclassifier/TextClassifierTest.java
+++ b/core/tests/coretests/src/android/view/textclassifier/TextClassifierTest.java
@@ -373,7 +373,7 @@ public class TextClassifierTest {
public void testSuggestConversationActions_textReplyOnly_maxThree() {
if (isTextClassifierDisabled()) return;
ConversationActions.Message message =
- new ConversationActions.Message.Builder().setText("Hello").build();
+ new ConversationActions.Message.Builder().setText("Where are you?").build();
ConversationActions.TypeConfig typeConfig =
new ConversationActions.TypeConfig.Builder().includeTypesFromTextClassifier(false)
.setIncludedTypes(