Rename PERSON_USER_LOCAL and PERSON_USER_REMOTE
Test: atest TextClassificationManagerTest.java
Bug: 123223181
Change-Id: I077d06aabf96d824942b99dd6ab95fe8adc2641f
diff --git a/apct-tests/perftests/core/src/android/textclassifier/TextClassifierPerfTest.java b/apct-tests/perftests/core/src/android/textclassifier/TextClassifierPerfTest.java
index a7a81f2..767434d 100644
--- a/apct-tests/perftests/core/src/android/textclassifier/TextClassifierPerfTest.java
+++ b/apct-tests/perftests/core/src/android/textclassifier/TextClassifierPerfTest.java
@@ -91,7 +91,7 @@
private static ConversationActions.Request createConversationActionsRequest(CharSequence text) {
ConversationActions.Message message =
new ConversationActions.Message.Builder(
- ConversationActions.Message.PERSON_USER_REMOTE)
+ ConversationActions.Message.PERSON_USER_OTHERS)
.setText(text)
.build();
return new ConversationActions.Request.Builder(Collections.singletonList(message))
diff --git a/api/current.txt b/api/current.txt
index 55f5a6d..4d202eb 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -53331,8 +53331,8 @@
method @Nullable public CharSequence getText();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.view.textclassifier.ConversationActions.Message> CREATOR;
- field public static final android.app.Person PERSON_USER_LOCAL;
- field public static final android.app.Person PERSON_USER_REMOTE;
+ field public static final android.app.Person PERSON_USER_OTHERS;
+ field public static final android.app.Person PERSON_USER_SELF;
}
public static final class ConversationActions.Message.Builder {
diff --git a/core/java/android/view/textclassifier/ActionsSuggestionsHelper.java b/core/java/android/view/textclassifier/ActionsSuggestionsHelper.java
index 77cb4cd..b5fa5ed 100644
--- a/core/java/android/view/textclassifier/ActionsSuggestionsHelper.java
+++ b/core/java/android/view/textclassifier/ActionsSuggestionsHelper.java
@@ -116,7 +116,7 @@
private int mNextUserId = FIRST_NON_LOCAL_USER;
private int encode(Person person) {
- if (ConversationActions.Message.PERSON_USER_LOCAL.equals(person)) {
+ if (ConversationActions.Message.PERSON_USER_SELF.equals(person)) {
return USER_LOCAL;
}
Integer result = mMapping.get(person);
diff --git a/core/java/android/view/textclassifier/ConversationActions.java b/core/java/android/view/textclassifier/ConversationActions.java
index f7c1a26..502181f 100644
--- a/core/java/android/view/textclassifier/ConversationActions.java
+++ b/core/java/android/view/textclassifier/ConversationActions.java
@@ -109,9 +109,9 @@
*
* @see Builder#Builder(Person)
*/
- public static final Person PERSON_USER_LOCAL =
+ public static final Person PERSON_USER_SELF =
new Person.Builder()
- .setKey("text-classifier-conversation-actions-local-user")
+ .setKey("text-classifier-conversation-actions-user-self")
.build();
/**
@@ -123,9 +123,9 @@
*
* @see Builder#Builder(Person)
*/
- public static final Person PERSON_USER_REMOTE =
+ public static final Person PERSON_USER_OTHERS =
new Person.Builder()
- .setKey("text-classifier-conversation-actions-remote-user")
+ .setKey("text-classifier-conversation-actions-user-others")
.build();
@Nullable
@@ -235,10 +235,10 @@
/**
* Constructs a builder.
*
- * @param author the person that composed the message, use {@link #PERSON_USER_LOCAL}
+ * @param author the person that composed the message, use {@link #PERSON_USER_SELF}
* to represent the local user. If it is not possible to identify the
* remote user that the local user is conversing with, use
- * {@link #PERSON_USER_REMOTE} to represent a remote user.
+ * {@link #PERSON_USER_OTHERS} to represent a remote user.
*/
public Builder(@NonNull Person author) {
mAuthor = Preconditions.checkNotNull(author);
diff --git a/core/tests/coretests/src/android/view/textclassifier/ActionsSuggestionsHelperTest.java b/core/tests/coretests/src/android/view/textclassifier/ActionsSuggestionsHelperTest.java
index 780e15a..5022e30 100644
--- a/core/tests/coretests/src/android/view/textclassifier/ActionsSuggestionsHelperTest.java
+++ b/core/tests/coretests/src/android/view/textclassifier/ActionsSuggestionsHelperTest.java
@@ -16,8 +16,8 @@
package android.view.textclassifier;
-import static android.view.textclassifier.ConversationActions.Message.PERSON_USER_LOCAL;
-import static android.view.textclassifier.ConversationActions.Message.PERSON_USER_REMOTE;
+import static android.view.textclassifier.ConversationActions.Message.PERSON_USER_OTHERS;
+import static android.view.textclassifier.ConversationActions.Message.PERSON_USER_SELF;
import static com.google.common.truth.Truth.assertThat;
@@ -58,7 +58,7 @@
@Test
public void testToNativeMessages_noTextMessages() {
ConversationActions.Message messageWithoutText =
- new ConversationActions.Message.Builder(PERSON_USER_REMOTE).build();
+ new ConversationActions.Message.Builder(PERSON_USER_OTHERS).build();
ActionsSuggestionsModel.ConversationMessage[] conversationMessages =
ActionsSuggestionsHelper.toNativeMessages(
@@ -81,7 +81,7 @@
.setText("second")
.build();
ConversationActions.Message thirdMessage =
- new ConversationActions.Message.Builder(PERSON_USER_LOCAL)
+ new ConversationActions.Message.Builder(PERSON_USER_SELF)
.setText("third")
.build();
ConversationActions.Message fourthMessage =
@@ -104,16 +104,16 @@
@Test
public void testToNativeMessages_referenceTime() {
ConversationActions.Message firstMessage =
- new ConversationActions.Message.Builder(PERSON_USER_REMOTE)
+ new ConversationActions.Message.Builder(PERSON_USER_OTHERS)
.setText("first")
.setReferenceTime(createZonedDateTimeFromMsUtc(1000))
.build();
ConversationActions.Message secondMessage =
- new ConversationActions.Message.Builder(PERSON_USER_REMOTE)
+ new ConversationActions.Message.Builder(PERSON_USER_OTHERS)
.setText("second")
.build();
ConversationActions.Message thirdMessage =
- new ConversationActions.Message.Builder(PERSON_USER_REMOTE)
+ new ConversationActions.Message.Builder(PERSON_USER_OTHERS)
.setText("third")
.setReferenceTime(createZonedDateTimeFromMsUtc(2000))
.build();
diff --git a/core/tests/coretests/src/android/view/textclassifier/TextClassifierTest.java b/core/tests/coretests/src/android/view/textclassifier/TextClassifierTest.java
index 4d78e40..5e58f82 100644
--- a/core/tests/coretests/src/android/view/textclassifier/TextClassifierTest.java
+++ b/core/tests/coretests/src/android/view/textclassifier/TextClassifierTest.java
@@ -378,7 +378,7 @@
if (isTextClassifierDisabled()) return;
ConversationActions.Message message =
new ConversationActions.Message.Builder(
- ConversationActions.Message.PERSON_USER_REMOTE)
+ ConversationActions.Message.PERSON_USER_OTHERS)
.setText("Where are you?")
.build();
TextClassifier.EntityConfig typeConfig =
@@ -407,7 +407,7 @@
if (isTextClassifierDisabled()) return;
ConversationActions.Message message =
new ConversationActions.Message.Builder(
- ConversationActions.Message.PERSON_USER_REMOTE)
+ ConversationActions.Message.PERSON_USER_OTHERS)
.setText("Where are you?")
.build();
TextClassifier.EntityConfig typeConfig =
diff --git a/packages/ExtServices/src/android/ext/services/notification/SmartActionsHelper.java b/packages/ExtServices/src/android/ext/services/notification/SmartActionsHelper.java
index 0d528e7..248b367 100644
--- a/packages/ExtServices/src/android/ext/services/notification/SmartActionsHelper.java
+++ b/packages/ExtServices/src/android/ext/services/notification/SmartActionsHelper.java
@@ -291,7 +291,7 @@
Parcelable[] messages = notification.extras.getParcelableArray(Notification.EXTRA_MESSAGES);
if (messages == null || messages.length == 0) {
return Arrays.asList(new ConversationActions.Message.Builder(
- ConversationActions.Message.PERSON_USER_REMOTE)
+ ConversationActions.Message.PERSON_USER_OTHERS)
.setText(notification.extras.getCharSequence(Notification.EXTRA_TEXT))
.build());
}
@@ -310,7 +310,7 @@
break;
}
Person author = localUser != null && localUser.equals(senderPerson)
- ? ConversationActions.Message.PERSON_USER_LOCAL : senderPerson;
+ ? ConversationActions.Message.PERSON_USER_SELF : senderPerson;
extractMessages.push(new ConversationActions.Message.Builder(author)
.setText(message.getText())
.setReferenceTime(
diff --git a/packages/ExtServices/tests/src/android/ext/services/notification/SmartActionHelperTest.java b/packages/ExtServices/tests/src/android/ext/services/notification/SmartActionHelperTest.java
index 707349b..7f8127a 100644
--- a/packages/ExtServices/tests/src/android/ext/services/notification/SmartActionHelperTest.java
+++ b/packages/ExtServices/tests/src/android/ext/services/notification/SmartActionHelperTest.java
@@ -154,7 +154,7 @@
ConversationActions.Message secondMessage = messages.get(0);
MessageSubject.assertThat(secondMessage).hasText("secondMessage");
MessageSubject.assertThat(secondMessage)
- .hasPerson(ConversationActions.Message.PERSON_USER_LOCAL);
+ .hasPerson(ConversationActions.Message.PERSON_USER_SELF);
MessageSubject.assertThat(secondMessage)
.hasReferenceTime(createZonedDateTimeFromMsUtc(2000));