diff options
| author | Scott Main <smain@google.com> | 2010-06-15 10:36:14 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-06-15 10:36:14 -0700 |
| commit | 322e7e477d89aca18d65cbd289343e716c45a699 (patch) | |
| tree | 468aedc2977c75681144b5153bc2e93448553b77 | |
| parent | 1067e6895e941f56edc7bc3d7c16a7122fb5259b (diff) | |
| parent | f10e6331e3bf01653235d93aa523056c146a85a3 (diff) | |
| download | frameworks_base-322e7e477d89aca18d65cbd289343e716c45a699.zip frameworks_base-322e7e477d89aca18d65cbd289343e716c45a699.tar.gz frameworks_base-322e7e477d89aca18d65cbd289343e716c45a699.tar.bz2 | |
Merge "docs: fix markup error" into froyo
| -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 0aa1fde..adceeb2 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. */ |