Merge "Rename PERSON_USER_LOCAL and PERSON_USER_REMOTE" (3abecb46) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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))

api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -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 {

core/java/android/view/textclassifier/ActionsSuggestionsHelper.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

core/java/android/view/textclassifier/ConversationActions.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -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);

core/tests/coretests/src/android/view/textclassifier/ActionsSuggestionsHelperTest.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -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();