Merge "Rename TextAttributeBuilder" (55f8b4d3) · Commits · e / os / android_frameworks_base

core/api/current.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -53015,11 +53015,11 @@ package android.view.inputmethod {
		field @NonNull public static final android.os.Parcelable.Creator<android.view.inputmethod.TextAttribute> CREATOR;
		}

		public static final class TextAttribute.TextAttributeBuilder {
		ctor public TextAttribute.TextAttributeBuilder();
		public static final class TextAttribute.Builder {
		ctor public TextAttribute.Builder();
		method @NonNull public android.view.inputmethod.TextAttribute build();
		method @NonNull public android.view.inputmethod.TextAttribute.TextAttributeBuilder setExtras(@NonNull android.os.PersistableBundle);
		method @NonNull public android.view.inputmethod.TextAttribute.TextAttributeBuilder setTextConversionSuggestions(@NonNull java.util.List<java.lang.String>);
		method @NonNull public android.view.inputmethod.TextAttribute.Builder setExtras(@NonNull android.os.PersistableBundle);
		method @NonNull public android.view.inputmethod.TextAttribute.Builder setTextConversionSuggestions(@NonNull java.util.List<java.lang.String>);
		}

		public final class TextSnapshot {

core/java/android/text/InputType.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ package android.text;

		import android.view.inputmethod.InputConnection;
		import android.view.inputmethod.TextAttribute;
		import android.view.inputmethod.TextAttribute.TextAttributeBuilder;
		import android.view.inputmethod.TextAttribute.Builder;

		import java.util.List;

		@@ -200,7 +200,7 @@ public interface InputType {
		* which has pronunciation characters and target characters. When the user is typing the
		* pronunciation charactes, the IME could provide the possible target characters to the user.
		* When this flag is set, the IME should insert the text conversion suggestions through
		* {@link TextAttributeBuilder#setTextConversionSuggestions(List)} and
		* {@link Builder#setTextConversionSuggestions(List)} and
		* the {@link TextAttribute} with initialized with the text conversion suggestions is provided
		* by the IME to the application. To receive the additional information, the application needs
		* to implement {@link InputConnection#setComposingText(CharSequence, int, TextAttribute)},

core/java/android/view/inputmethod/TextAttribute.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ public final class TextAttribute implements Parcelable {
		private final @NonNull List<String> mTextConversionSuggestions;
		private final @NonNull PersistableBundle mExtras;

		private TextAttribute(TextAttributeBuilder builder) {
		private TextAttribute(Builder builder) {
		mTextConversionSuggestions = builder.mTextConversionSuggestions;
		mExtras = builder.mExtras;
		}
		@@ -48,7 +48,7 @@ public final class TextAttribute implements Parcelable {

		/**
		* Get the list of text conversion suggestions. More text conversion details in
		* {@link TextAttributeBuilder#setTextConversionSuggestions(List)}.
		* {@link Builder#setTextConversionSuggestions(List)}.
		*
		* @return List of text conversion suggestions. If the list is empty, it means that IME not set
		* this field or IME didn't have suggestions for applications.
		@@ -59,7 +59,7 @@ public final class TextAttribute implements Parcelable {

		/**
		* Get the extras data. More extras data details in
		* {@link TextAttributeBuilder#setExtras(PersistableBundle)}.
		* {@link Builder#setExtras(PersistableBundle)}.
		*
		* @return Extras data. If the Bundle is empty, it means that IME not set this field or IME
		* didn't have extras data.
		@@ -71,7 +71,7 @@ public final class TextAttribute implements Parcelable {
		/**
		* Builder for creating a {@link TextAttribute}.
		*/
		public static final class TextAttributeBuilder {
		public static final class Builder {
		private List<String> mTextConversionSuggestions = new ArrayList<>();
		private PersistableBundle mExtras = new PersistableBundle();

		@@ -87,7 +87,7 @@ public final class TextAttribute implements Parcelable {
		* @param textConversionSuggestions The list of text conversion suggestions.
		* @return This builder
		*/
		public @NonNull TextAttributeBuilder setTextConversionSuggestions(
		public @NonNull Builder setTextConversionSuggestions(
		@NonNull List<String> textConversionSuggestions) {
		mTextConversionSuggestions = Collections.unmodifiableList(textConversionSuggestions);
		return this;
		@@ -101,7 +101,7 @@ public final class TextAttribute implements Parcelable {
		*
		* @return This builder.
		*/
		public @NonNull TextAttributeBuilder setExtras(@NonNull PersistableBundle extras) {
		public @NonNull Builder setExtras(@NonNull PersistableBundle extras) {
		mExtras = extras;
		return this;
		}