Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74e151c5 authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

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

Merge commit '5f1d1002' into froyo-plus-aosp

* commit '5f1d1002':
  docs: fix markup error
parents fbb285e6 5f1d1002

core/java/android/webkit/WebView.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -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