diff options
| author | Scott Main <smain@google.com> | 2010-06-02 13:46:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-02 13:46:53 -0700 |
| commit | c87d5849f22d805b3dde8f70f60ddfadfc7c7b9d (patch) | |
| tree | c029bf867419aa3d97697f8d1709009e43aaacf2 | |
| parent | b705eea70245dae69d16e18d63b3ee38e1d0c5c3 (diff) | |
| parent | 105e1c5adc3da14996d659ac403e7254b81bcb76 (diff) | |
| download | frameworks_base-c87d5849f22d805b3dde8f70f60ddfadfc7c7b9d.zip frameworks_base-c87d5849f22d805b3dde8f70f60ddfadfc7c7b9d.tar.gz frameworks_base-c87d5849f22d805b3dde8f70f60ddfadfc7c7b9d.tar.bz2 | |
am 105e1c5a: am 6a297118: Merge "docs: a couple doc bug fixes" into froyo
Merge commit '105e1c5adc3da14996d659ac403e7254b81bcb76' into kraken
* commit '105e1c5adc3da14996d659ac403e7254b81bcb76':
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> |