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

Commit 105e1c5a authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am 6a297118: Merge "docs: a couple doc bug fixes" into froyo 

Merge commit '6a297118' into froyo-plus-aosp

* commit '6a297118':
  docs: a couple doc bug fixes
parents 1bd7597b 6a297118

docs/html/guide/topics/data/backup.jd

+1 −1
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ onBackup()}. 
<p>For an example implementation of {@link android.app.backup.BackupAgent}, see the <a

href="{@docRoot}resources/samples/BackupRestore/src/com/example/android/backuprestore/ExampleAgent.html">{@code

ExampleAgent}</a> class in the <a

href="{@docRoot}}resources/samples/BackupRestore/index.html">Backup and Restore</a> sample

href="{@docRoot}resources/samples/BackupRestore/index.html">Backup and Restore</a> sample

application.</p>

</div>

docs/html/resources/tutorials/views/hello-webview.jd

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ that can view and navigate web pages.</p> 
   <li>Open the <code>res/layout/main.xml</code> file and insert the following:

<pre>

&lt;?xml version="1.0" encoding="utf-8"?>

&lt;WebView

&lt;WebView  xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/webview"

    android:layout_width="fill_parent"

    android:layout_height="fill_parent"
@@ -79,7 +79,7 @@ private class HelloWebViewClient extends WebViewClient { 
  </li>

  <li>Then towards the end of the {@link android.app.Activity#onCreate(Bundle)} method, set an

  instance of the <code>HelloWebViewClient</code> as the {@link android.webkit.WebViewClient}:

   <pre>mWebView.setWebViewClient(new WebViewClientDemo());</pre>

   <pre>mWebView.setWebViewClient(new HelloWebViewClient());</pre>



    <p>This line can go anywhere following the initialization of the {@link

    android.webkit.WebView} object.</p>