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

am 322e7e47: Merge "docs: fix markup error" into froyo

Browse Source 
Merge commit '322e7e477d89aca18d65cbd289343e716c45a699' into gingerbread

* commit '322e7e477d89aca18d65cbd289343e716c45a699':
  docs: fix markup error
This commit is contained in:
Scott Main
2010-06-15 10:42:52 -07:00
committed by Android Git Automerger
parent 2d468c5d73 322e7e477d
commit e4bca7ee60
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/WindowManager.java
View File

@@ -685,7 +685,7 @@ public interface WindowManager extends ViewManager {
/** Adjustment option for {@link #softInputMode}: set to allow the /** Adjustment option for {@link #softInputMode}: set to allow the
* window to be resized when an input * window to be resized when an input
* method is shown, so that its contents are not covered by the 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 * {@link #SOFT_INPUT_ADJUST_PAN}; if
* neither of these are set, then the system will try to pick one or * neither of these are set, then the system will try to pick one or
* the other depending on the contents of the window. * the other depending on the contents of the window.
@@ -696,7 +696,7 @@ public interface WindowManager extends ViewManager {
* pan when an input method is * pan when an input method is
* shown, so it doesn't need to deal with resizing but just panned * 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 * 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 * neither of these are set, then the system will try to pick one or
* the other depending on the contents of the window. * the other depending on the contents of the window.
*/ */