Merge "add xml attributes to IME javadoc" into klp-dev (bab3348f) · Commits · e / os / android_frameworks_base

core/java/android/view/inputmethod/InputMethodInfo.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,17 @@ import java.util.Map;

		/**
		* This class is used to specify meta information of an input method.
		*
		* <p>It should be defined in an XML resource file with an {@code <input-method>} element.
		* For more information, see the guide to
		* <a href="{@docRoot}guide/topics/text/creating-input-method.html">
		* Creating an Input Method</a>.</p>
		*
		* @see InputMethodSubtype
		*
		* @attr ref android.R.styleable#InputMethod_settingsActivity
		* @attr ref android.R.styleable#InputMethod_isDefault
		* @attr ref android.R.styleable#InputMethod_supportsSwitchingToNextInputMethod
		*/
		public final class InputMethodInfo implements Parcelable {
		static final String TAG = "InputMethodInfo";

+15 −2

Original line number	Diff line number	Diff line
		@@ -38,9 +38,22 @@ import java.util.Locale;
		* the specified subtype of the designated IME directly.
		*
		* <p>It should be defined in an XML resource file of the input method with the
		* <code><subtype></code> element. For more information, see the guide to
		* <a href="{@docRoot}resources/articles/creating-input-method.html">
		* <code><subtype></code> element, which resides within an {@code <input-method>} element.
		* For more information, see the guide to
		* <a href="{@docRoot}guide/topics/text/creating-input-method.html">
		* Creating an Input Method</a>.</p>
		*
		* @see InputMethodInfo
		*
		* @attr ref android.R.styleable#InputMethod_Subtype_label
		* @attr ref android.R.styleable#InputMethod_Subtype_icon
		* @attr ref android.R.styleable#InputMethod_Subtype_imeSubtypeLocale
		* @attr ref android.R.styleable#InputMethod_Subtype_imeSubtypeMode
		* @attr ref android.R.styleable#InputMethod_Subtype_imeSubtypeExtraValue
		* @attr ref android.R.styleable#InputMethod_Subtype_isAuxiliary
		* @attr ref android.R.styleable#InputMethod_Subtype_overridesImplicitlyEnabledSubtype
		* @attr ref android.R.styleable#InputMethod_Subtype_subtypeId
		* @attr ref android.R.styleable#InputMethod_Subtype_isAsciiCapable
		*/
		public final class InputMethodSubtype implements Parcelable {
		private static final String TAG = InputMethodSubtype.class.getSimpleName();