diff options
| author | Scott Main <smain@google.com> | 2010-06-02 13:44:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-02 13:44:44 -0700 |
| commit | 105e1c5adc3da14996d659ac403e7254b81bcb76 (patch) | |
| tree | 9da2da20306475e13a60493f177714e498785764 | |
| parent | 1bd7597b8cdaf39d1183077c463cb30596eb31b0 (diff) | |
| parent | 6a297118724f31b1063b74f52295d459ec4f58dc (diff) | |
| download | frameworks_base-105e1c5adc3da14996d659ac403e7254b81bcb76.zip frameworks_base-105e1c5adc3da14996d659ac403e7254b81bcb76.tar.gz frameworks_base-105e1c5adc3da14996d659ac403e7254b81bcb76.tar.bz2 | |
am 6a297118: Merge "docs: a couple doc bug fixes" into froyo
Merge commit '6a297118724f31b1063b74f52295d459ec4f58dc' into froyo-plus-aosp
* commit '6a297118724f31b1063b74f52295d459ec4f58dc':
docs: a couple doc bug fixes
| -rw-r--r-- | docs/html/guide/topics/data/backup.jd | 2 | ||||
| -rw-r--r-- | docs/html/resources/tutorials/views/hello-webview.jd | 4 |
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> <?xml version="1.0" encoding="utf-8"?> -<WebView +<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> |