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

am 74e151c5: am 5f1d1002: Merge "docs: fix markup error" into froyo

Browse Source 
Merge commit '74e151c54c31cf7324771fcabc06e9fbfe1118ca' into kraken

* commit '74e151c54c31cf7324771fcabc06e9fbfe1118ca':
  docs: fix markup error
This commit is contained in:
Scott Main
2010-05-18 09:07:39 -07:00
committed by Android Git Automerger
parent d633215b60 74e151c54c
commit 8473259ddb
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/webkit/WebView.java
View File

@@ -143,12 +143,13 @@ import junit.framework.Assert;
* </pre> * </pre>
* *
* <p>Then load the desired web page:</p> * <p>Then load the desired web page:</p>
* <pre>
* // Simplest usage: note that an exception will NOT be thrown * // Simplest usage: note that an exception will NOT be thrown
* // if there is an error loading this page (see below). * // if there is an error loading this page (see below).
* webview.loadUrl("http://slashdot.org/"); * webview.loadUrl("http://slashdot.org/");
* *
* // OR, you can also load from an HTML string: * // OR, you can also load from an HTML string:
* String summary = "&lt;html>&lt;body>You scored &lt;b>192</b> points.&lt;/body>&lt;/html>"; * String summary = "&lt;html>&lt;body>You scored &lt;b>192&lt;/b> points.&lt;/body>&lt;/html>";
* webview.loadData(summary, "text/html", "utf-8"); * webview.loadData(summary, "text/html", "utf-8");
* // ... although note that there are restrictions on what this HTML can do. * // ... although note that there are restrictions on what this HTML can do.
* // See the JavaDocs for {@link #loadData(String,String,String) loadData()} and {@link * // See the JavaDocs for {@link #loadData(String,String,String) loadData()} and {@link