diff options
| author | Newton Allen <newt@google.com> | 2014-10-02 16:46:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-02 16:46:03 +0000 |
| commit | 408f7534ef49fc87a4e10d751a0bbf2540a40bf7 (patch) | |
| tree | 184a0780066c833866e76d07e74c141b5427ee45 /core/java/android/view | |
| parent | 2b7d4b24a3273de499b025bab50bf61fce5f4a3c (diff) | |
| parent | d84ce32bd2d7c3cebac15545504f4fec464a6956 (diff) | |
| download | frameworks_base-408f7534ef49fc87a4e10d751a0bbf2540a40bf7.zip frameworks_base-408f7534ef49fc87a4e10d751a0bbf2540a40bf7.tar.gz frameworks_base-408f7534ef49fc87a4e10d751a0bbf2540a40bf7.tar.bz2 | |
am d84ce32b: Merge "Fix some documentation typos." into lmp-dev
* commit 'd84ce32bd2d7c3cebac15545504f4fec464a6956':
Fix some documentation typos.
Diffstat (limited to 'core/java/android/view')
| -rw-r--r-- | core/java/android/view/View.java | 4 | ||||
| -rw-r--r-- | core/java/android/view/inputmethod/InputConnection.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index b454681..1ecc8d9 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -5033,7 +5033,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * <strong>Note:</strong> When a View clears focus the framework is trying * to give focus to the first focusable View from the top. Hence, if this * View is the first from the top that can take focus, then all callbacks - * related to clearing focus will be invoked after wich the framework will + * related to clearing focus will be invoked after which the framework will * give focus to this view. * </p> */ @@ -6379,7 +6379,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @see #setFitsSystemWindows(boolean) * @see #setSystemUiVisibility(int) * - * @deprecated As of API XX use {@link #dispatchApplyWindowInsets(WindowInsets)} to apply + * @deprecated As of API 20 use {@link #dispatchApplyWindowInsets(WindowInsets)} to apply * insets to views. Views should override {@link #onApplyWindowInsets(WindowInsets)} or use * {@link #setOnApplyWindowInsetsListener(android.view.View.OnApplyWindowInsetsListener)} * to implement handling their own insets. diff --git a/core/java/android/view/inputmethod/InputConnection.java b/core/java/android/view/inputmethod/InputConnection.java index c51d8a7..ff992d3 100644 --- a/core/java/android/view/inputmethod/InputConnection.java +++ b/core/java/android/view/inputmethod/InputConnection.java @@ -75,7 +75,7 @@ import android.view.KeyEvent; * behavior you should adopt for a particular call, please mimic the * default TextView implementation in the latest Android version, and * if you decide to drift from it, please consider carefully that - * inconsistencies in text edition behavior is almost universally felt + * inconsistencies in text editor behavior is almost universally felt * as a bad thing by users.</p> * * <h3>Cursors, selections and compositions</h3> |