diff options
| author | 2010-06-15 10:47:21 -0700 | |
|---|---|---|
| committer | 2010-06-15 10:47:21 -0700 | |
| commit | fb48f3a25d821a9037591aa76faa7bae46d1debd (patch) | |
| tree | c0cc831f80cb0846ddfef476af0aaf9b927106f2 | |
| parent | 5126633a3e7d04754792e0702231b1b6be2d1498 (diff) | |
| parent | e4bca7ee60c6d361ef9f1f025881a6f80a9efdab (diff) | |
am e4bca7ee: am 322e7e47: Merge "docs: fix markup error" into froyo
Merge commit 'e4bca7ee60c6d361ef9f1f025881a6f80a9efdab' into gingerbread-plus-aosp
* commit 'e4bca7ee60c6d361ef9f1f025881a6f80a9efdab':
docs: fix markup error
| -rw-r--r-- | core/java/android/view/WindowManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 0aa1fdea1d6c..adceeb2074c2 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -685,7 +685,7 @@ public interface WindowManager extends ViewManager { /** Adjustment option for {@link #softInputMode}: set to allow the * window to be resized when an input * method is shown, so that its contents are not covered by the input - * method. This can <em>not<em> be combined with + * method. This can <em>not</em> be combined with * {@link #SOFT_INPUT_ADJUST_PAN}; if * neither of these are set, then the system will try to pick one or * the other depending on the contents of the window. @@ -696,7 +696,7 @@ public interface WindowManager extends ViewManager { * pan when an input method is * shown, so it doesn't need to deal with resizing but just panned * by the framework to ensure the current input focus is visible. This - * can <em>not<em> be combined with {@link #SOFT_INPUT_ADJUST_RESIZE}; if + * can <em>not</em> be combined with {@link #SOFT_INPUT_ADJUST_RESIZE}; if * neither of these are set, then the system will try to pick one or * the other depending on the contents of the window. */ |