Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename PERSON_USER_LOCAL and PERSON_USER_REMOTE"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-25 17:16:38 +00:00
committed by Android (Google) Code Review
parent 7538294418 91daa15eea
commit 3abecb462b
8 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apct-tests/perftests/core/src/android/textclassifier/TextClassifierPerfTest.java
View File

@@ -91,7 +91,7 @@ public class TextClassifierPerfTest {
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))

4
api/current.txt
View File

@@ -53341,8 +53341,8 @@ package android.view.textclassifier {
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 {

2
core/java/android/view/textclassifier/ActionsSuggestionsHelper.java
View File

@@ -115,7 +115,7 @@ public final class ActionsSuggestionsHelper {
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);

12
core/java/android/view/textclassifier/ConversationActions.java
View File

@@ -109,9 +109,9 @@ public final class ConversationActions implements Parcelable {
*
* @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 @@ public final class ConversationActions implements Parcelable {
*
* @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 @@ public final class ConversationActions implements Parcelable {
/**
* 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);

14
core/tests/coretests/src/android/view/textclassifier/ActionsSuggestionsHelperTest.java
View File

@@ -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 @@ public class ActionsSuggestionsHelperTest {
@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 @@ public class ActionsSuggestionsHelperTest {
.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 @@ public class ActionsSuggestionsHelperTest {
@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();

4
core/tests/coretests/src/android/view/textclassifier/TextClassifierTest.java
View File

@@ -378,7 +378,7 @@ public class TextClassifierTest {
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 @@ public class TextClassifierTest {
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 =

4
packages/ExtServices/src/android/ext/services/notification/SmartActionsHelper.java
View File

@@ -291,7 +291,7 @@ public class SmartActionsHelper {
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 @@ public class SmartActionsHelper {
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(

2
packages/ExtServices/tests/src/android/ext/services/notification/SmartActionHelperTest.java
View File

@@ -154,7 +154,7 @@ public class SmartActionHelperTest {
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));