summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2010-06-02 22:35:27 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-02 22:35:27 -0700
commit0ba461eb51c130d7b0c69d674337715b363c1b1c (patch)
tree282b89cfab746ed118f351c124202914a8bef65c /docs
parent3e7432f823b9f0457e935614787cff4eb71a8f2b (diff)
parentaed8f21690acd9b4152fc2fd8b515d47624e8184 (diff)
downloadframeworks_base-0ba461eb51c130d7b0c69d674337715b363c1b1c.zip
frameworks_base-0ba461eb51c130d7b0c69d674337715b363c1b1c.tar.gz
frameworks_base-0ba461eb51c130d7b0c69d674337715b363c1b1c.tar.bz2
am aed8f216: am c87d5849: am 105e1c5a: am 6a297118: Merge "docs: a couple doc bug fixes" into froyo
Diffstat (limited to 'docs')
-rw-r--r--docs/html/guide/topics/data/backup.jd2
-rw-r--r--docs/html/resources/tutorials/views/hello-webview.jd4
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/html/guide/topics/data/backup.jd b/docs/html/guide/topics/data/backup.jd
index 74117d6..aad0f92 100644
--- a/docs/html/guide/topics/data/backup.jd
+++ b/docs/html/guide/topics/data/backup.jd
@@ -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>
diff --git a/docs/html/resources/tutorials/views/hello-webview.jd b/docs/html/resources/tutorials/views/hello-webview.jd
index 17b2646..2d07647 100644
--- a/docs/html/resources/tutorials/views/hello-webview.jd
+++ b/docs/html/resources/tutorials/views/hello-webview.jd
@@ -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>