Merge "Add the new Text input type TYPE_TEXT_FLAG_ENABLE_TEXT_CONVERSION_SUGGESTIONS" (97e43c3b) · Commits · e / os / android_frameworks_base

core/api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -44678,6 +44678,7 @@ package android.text {
		field public static final int TYPE_TEXT_FLAG_CAP_CHARACTERS = 4096; // 0x1000
		field public static final int TYPE_TEXT_FLAG_CAP_SENTENCES = 16384; // 0x4000
		field public static final int TYPE_TEXT_FLAG_CAP_WORDS = 8192; // 0x2000
		field public static final int TYPE_TEXT_FLAG_ENABLE_TEXT_CONVERSION_SUGGESTIONS = 1048576; // 0x100000
		field public static final int TYPE_TEXT_FLAG_IME_MULTI_LINE = 262144; // 0x40000
		field public static final int TYPE_TEXT_FLAG_MULTI_LINE = 131072; // 0x20000
		field public static final int TYPE_TEXT_FLAG_NO_SUGGESTIONS = 524288; // 0x80000

core/java/android/text/InputType.java

+21 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,12 @@

		package android.text;

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

		import java.util.List;

		/**
		* Bit definitions for an integer defining the basic content type of text
		* held in an {@link Editable} object. Supported classes may be combined
		@@ -188,6 +194,21 @@ public interface InputType {
		*/
		public static final int TYPE_TEXT_FLAG_NO_SUGGESTIONS = 0x00080000;

		/**
		* Flag for {@link #TYPE_CLASS_TEXT}: Let the IME know the text conversion suggestions are
		* required by the application. Text conversion suggestion is for the transliteration languages
		* 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
		* 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)},
		* {@link InputConnection#setComposingRegion(int, int, TextAttribute)}, and
		* {@link InputConnection#commitText(CharSequence, int, TextAttribute)}.
		*/
		public static final int TYPE_TEXT_FLAG_ENABLE_TEXT_CONVERSION_SUGGESTIONS = 0x00100000;

		// ----------------------------------------------------------------------

		/**

core/java/android/view/inputmethod/EditorInfo.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -92,6 +92,7 @@ public class EditorInfo implements InputType, Parcelable {
		* 1 TYPE_TEXT_FLAG_MULTI_LINE
		* 1 TYPE_TEXT_FLAG_IME_MULTI_LINE
		* 1 TYPE_TEXT_FLAG_NO_SUGGESTIONS
		* 1 TYPE_TEXT_FLAG_ENABLE_TEXT_CONVERSION_SUGGESTIONS
		* \|-------\|-------\|-------\|-------\|
		* 1 TYPE_CLASS_NUMBER
		* 1 TYPE_NUMBER_VARIATION_PASSWORD

core/res/res/values/attrs.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -1329,6 +1329,11 @@
		dictionary-based word suggestions. Corresponds to
		{@link android.text.InputType#TYPE_TEXT_FLAG_NO_SUGGESTIONS}. -->
		<flag name="textNoSuggestions" value="0x00080001" />
		<!-- Can be combined with <var>text</var> and its variations to
		indicate that if there is extra information, the IME should provide
		{@link android.view.inputmethod.TextAttribute}. Corresponds to
		{@link android.text.InputType#TYPE_TEXT_FLAG_ENABLE_TEXT_CONVERSION_SUGGESTIONS}. -->
		<flag name="textEnableTextConversionSuggestions" value="0x00100001" />
		<!-- Text that will be used as a URI. Corresponds to
		{@link android.text.InputType#TYPE_CLASS_TEXT} \|
		{@link android.text.InputType#TYPE_TEXT_VARIATION_URI}. -->