diff options
| author | Scott Main <smain@google.com> | 2010-05-18 09:07:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-18 09:07:39 -0700 |
| commit | 8473259ddb693e4c41e8ec4313466351ff5b92f7 (patch) | |
| tree | e57a15f28ad10ddacefdbbd83f83c3b531a374b4 /core | |
| parent | d633215b60cc9a8c64cca8d6e7f6af6dfd0fbfb1 (diff) | |
| parent | 74e151c54c31cf7324771fcabc06e9fbfe1118ca (diff) | |
| download | frameworks_base-8473259ddb693e4c41e8ec4313466351ff5b92f7.zip frameworks_base-8473259ddb693e4c41e8ec4313466351ff5b92f7.tar.gz frameworks_base-8473259ddb693e4c41e8ec4313466351ff5b92f7.tar.bz2 | |
am 74e151c5: am 5f1d1002: Merge "docs: fix markup error" into froyo
Merge commit '74e151c54c31cf7324771fcabc06e9fbfe1118ca' into kraken
* commit '74e151c54c31cf7324771fcabc06e9fbfe1118ca':
docs: fix markup error
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 863a6cd..921d0f5 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -143,12 +143,13 @@ import junit.framework.Assert; * </pre> * * <p>Then load the desired web page:</p> + * <pre> * // Simplest usage: note that an exception will NOT be thrown * // if there is an error loading this page (see below). * webview.loadUrl("http://slashdot.org/"); * * // OR, you can also load from an HTML string: - * String summary = "<html><body>You scored <b>192</b> points.</body></html>"; + * String summary = "<html><body>You scored <b>192</b> points.</body></html>"; * webview.loadData(summary, "text/html", "utf-8"); * // ... although note that there are restrictions on what this HTML can do. * // See the JavaDocs for {@link #loadData(String,String,String) loadData()} and {@link |