Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Scott Main
2010-06-02 13:49:10 -07:00
committed by Android Git Automerger
parent 8f1259bec9 c87d5849f2
commit aed8f21690
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/html/guide/topics/data/backup.jd
View File

@@ -445,7 +445,7 @@ onBackup()}.
<p>For an example implementation of {@link android.app.backup.BackupAgent}, see the <a <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 href="{@docRoot}resources/samples/BackupRestore/src/com/example/android/backuprestore/ExampleAgent.html">{@code
ExampleAgent}</a> class in the <a 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> application.</p>
</div> </div>

4
docs/html/resources/tutorials/views/hello-webview.jd
View File

@@ -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: <li>Open the <code>res/layout/main.xml</code> file and insert the following:
<pre> <pre>
&lt;?xml version="1.0" encoding="utf-8"?> &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:id="@+id/webview"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
@@ -79,7 +79,7 @@ private class HelloWebViewClient extends WebViewClient {
</li> </li>
<li>Then towards the end of the {@link android.app.Activity#onCreate(Bundle)} method, set an <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}: 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 <p>This line can go anywhere following the initialization of the {@link
android.webkit.WebView} object.</p> android.webkit.WebView} object.</p>