drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 218ecd43: Fix the docs build

Browse Source 
* commit '218ecd43946001f07b60757db130ef5585d474d3':
  Fix the docs build
This commit is contained in:
Jean Chalard
2013-11-12 22:27:47 -08:00
committed by Android Git Automerger
parent 383ef79d14 218ecd4394
commit d952ac4c17
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/text/InputType.java
View File

@ -128,8 +128,8 @@ public interface InputType {
* the IME will not try to correct typos. You should always set this flag * the IME will not try to correct typos. You should always set this flag
* unless you really expect users to type non-words in this field, for * unless you really expect users to type non-words in this field, for
* example to choose a name for a character in a game. * example to choose a name for a character in a game.
* Contrast this with {@link TYPE_TEXT_FLAG_AUTO_COMPLETE} and * Contrast this with {@link #TYPE_TEXT_FLAG_AUTO_COMPLETE} and
* {@link TYPE_TEXT_FLAG_NO_SUGGESTIONS}: * {@link #TYPE_TEXT_FLAG_NO_SUGGESTIONS}:
* {@code TYPE_TEXT_FLAG_AUTO_CORRECT} means that the IME will try to * {@code TYPE_TEXT_FLAG_AUTO_CORRECT} means that the IME will try to
* auto-correct typos as the user is typing, but does not define whether * auto-correct typos as the user is typing, but does not define whether
* the IME offers an interface to show suggestions. * the IME offers an interface to show suggestions.
@ -147,9 +147,9 @@ public interface InputType {
* InputMethodSession.displayCompletions()} as a result of the editor calling * InputMethodSession.displayCompletions()} as a result of the editor calling
* {@link android.view.inputmethod.InputMethodManager#displayCompletions * {@link android.view.inputmethod.InputMethodManager#displayCompletions
* InputMethodManager.displayCompletions()}. * InputMethodManager.displayCompletions()}.
* Note the contrast with {@link TYPE_TEXT_FLAG_AUTO_CORRECT} and * Note the contrast with {@link #TYPE_TEXT_FLAG_AUTO_CORRECT} and
* {@link TYPE_TEXT_FLAG_NO_SUGGESTIONS}: * {@link #TYPE_TEXT_FLAG_NO_SUGGESTIONS}:
* {@link TYPE_TEXT_FLAG_AUTO_COMPLETE} means the editor should show an * {@code TYPE_TEXT_FLAG_AUTO_COMPLETE} means the editor should show an
* interface for displaying suggestions, but instead of supplying its own * interface for displaying suggestions, but instead of supplying its own
* it will rely on the Editor to pass completions/corrections. * it will rely on the Editor to pass completions/corrections.
*/ */
@ -180,10 +180,10 @@ public interface InputType {
* Please avoid using this unless you are certain this is what you want. * Please avoid using this unless you are certain this is what you want.
* Many input methods need suggestions to work well, for example the ones * Many input methods need suggestions to work well, for example the ones
* based on gesture typing. Consider clearing * based on gesture typing. Consider clearing
* {@link TYPE_TEXT_FLAG_AUTO_CORRECT} instead if you just do not * {@link #TYPE_TEXT_FLAG_AUTO_CORRECT} instead if you just do not
* want the IME to correct typos. * want the IME to correct typos.
* Note the contrast with {@link TYPE_TEXT_FLAG_AUTO_CORRECT} and * Note the contrast with {@link #TYPE_TEXT_FLAG_AUTO_CORRECT} and
* {@link TYPE_TEXT_FLAG_AUTO_COMPLETE}: * {@link #TYPE_TEXT_FLAG_AUTO_COMPLETE}:
* {@code TYPE_TEXT_FLAG_NO_SUGGESTIONS} means the IME should never * {@code TYPE_TEXT_FLAG_NO_SUGGESTIONS} means the IME should never
* show an interface to display suggestions. Most IMEs will also take this to * show an interface to display suggestions. Most IMEs will also take this to
* mean they should not try to auto-correct what the user is typing. * mean they should not try to auto-correct what the user is typing.

2
core/java/android/view/inputmethod/EditorInfo.java
View File

@ -148,7 +148,7 @@ public class EditorInfo implements InputType, Parcelable {
* of the application be shown behind, through transparent UI parts in the * of the application be shown behind, through transparent UI parts in the
* fullscreen IME. The part of the UI visible to the user may not be responsive * fullscreen IME. The part of the UI visible to the user may not be responsive
* to touch because the IME will receive touch events, which may confuse the * to touch because the IME will receive touch events, which may confuse the
* user; use {@link IME_FLAG_NO_FULLSCREEN} instead for a better experience. * user; use {@link #IME_FLAG_NO_FULLSCREEN} instead for a better experience.
* Using this flag is discouraged and it may become deprecated in the future. * Using this flag is discouraged and it may become deprecated in the future.
* Its meaning is unclear in some situations and it may not work appropriately * Its meaning is unclear in some situations and it may not work appropriately
* on older versions of the platform. * on older versions of the platform.