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

Merge "add xml attributes to IME javadoc" into klp-dev

Browse Source
This commit is contained in:
Scott Main
2013-10-20 22:28:10 +00:00
committed by Android (Google) Code Review
parent d4595bd1e6 5df0631003
commit bab3348fc3
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/view/inputmethod/InputMethodInfo.java
View File

@@ -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 &lt;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";

17
core/java/android/view/inputmethod/InputMethodSubtype.java
View File

@@ -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>&lt;subtype&gt;</code> element. For more information, see the guide to
* <a href="{@docRoot}resources/articles/creating-input-method.html">
* <code>&lt;subtype&gt;</code> element, which resides within an {@code &lt;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();