diff options
| author | Christopher Tate <ctate@google.com> | 2010-04-07 14:31:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-07 14:31:03 -0700 |
| commit | 5d470d03df643801aa4eef11a26deee70da7b952 (patch) | |
| tree | 18f3ebfe4ee037fc4a34c3ba385e6bf3add0b150 | |
| parent | b4c1d0edea3e9d5a3a1149cf2587a0a5dc399aa2 (diff) | |
| parent | 5247bbd5609334329739adb0264e6950b1c7d062 (diff) | |
| download | frameworks_base-5d470d03df643801aa4eef11a26deee70da7b952.zip frameworks_base-5d470d03df643801aa4eef11a26deee70da7b952.tar.gz frameworks_base-5d470d03df643801aa4eef11a26deee70da7b952.tar.bz2 | |
am 5247bbd5: am 3b045eb0: am 560607ca: am 98e26575: Merge "Add Backup/Restore sample to the SDK docs" into froyo
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | docs/html/guide/samples/index.jd | 4 | ||||
| -rw-r--r-- | docs/html/resources/resources_toc.cs | 3 | ||||
| -rw-r--r-- | docs/html/resources/samples/index.jd | 4 |
4 files changed, 13 insertions, 0 deletions
@@ -381,6 +381,8 @@ web_docs_sample_code_flags := \ -hdf android.hasSamples 1 \ -samplecode $(sample_dir)/ApiDemos \ resources/samples/ApiDemos "API Demos" \ + -samplecode $(sample_dir)/BackupRestore \ + resources/samples/BackupRestore "Backup and Restore" \ -samplecode $(sample_dir)/BluetoothChat \ resources/samples/BluetoothChat "Bluetooth Chat" \ -samplecode $(sample_dir)/BusinessCard \ diff --git a/docs/html/guide/samples/index.jd b/docs/html/guide/samples/index.jd index 7923532..2f3ac5e 100644 --- a/docs/html/guide/samples/index.jd +++ b/docs/html/guide/samples/index.jd @@ -41,6 +41,10 @@ platforms) and allow you to view the source files in your browser. </p> <dd>A variety of small applications that demonstrate an extensive collection of framework topics.</dd> + <dt><a href="{@docRoot}resources/samples/BackupRestore/index.html">Backup and Restore</a></dt> + <dd>An simple example that illustrates a few different ways for an application to + implement support for the Android data backup and restore mechanism.</dd> + <dt><a href="{@docRoot}resources/samples/BluetoothChat/index.html">Bluetooth Chat</a></dt> <dd>An application for two-way text messaging over Bluetooth.</dd> diff --git a/docs/html/resources/resources_toc.cs b/docs/html/resources/resources_toc.cs index 5958f71..43ab562 100644 --- a/docs/html/resources/resources_toc.cs +++ b/docs/html/resources/resources_toc.cs @@ -188,6 +188,9 @@ <li><a href="<?cs var:toroot ?>resources/samples/ApiDemos/index.html"> <span class="en">API Demos</span> </a></li> + <li><a href="<?cs var:toroot ?>resources/samples/BackupRestore/index.html"> + <span class="en">Backup and Restore</span> + </a> <span class="new">new!</span></li> <li><a href="<?cs var:toroot ?>resources/samples/BluetoothChat/index.html"> <span class="en">Bluetooth Chat</span> </a></li> diff --git a/docs/html/resources/samples/index.jd b/docs/html/resources/samples/index.jd index 044c69d..2718d0c 100644 --- a/docs/html/resources/samples/index.jd +++ b/docs/html/resources/samples/index.jd @@ -22,6 +22,10 @@ href="{@docRoot}resources/samples/get.html">Getting the Samples</a>.</p> <dd>A variety of small applications that demonstrate an extensive collection of framework topics.</dd> + <dt><a href="BackupRestore/index.html">Backup and Restore</a></dt> + <dd>An simple example that illustrates a few different ways for an application to + implement support for the Android data backup and restore mechanism.</dd> + <dt><a href="BluetoothChat/index.html">Bluetooth Chat</a></dt> <dd>An application for two-way text messaging over Bluetooth.</dd> |