summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/html/community/index.jd2
-rw-r--r--docs/html/guide/developing/device.jd2
-rw-r--r--docs/html/guide/practices/ui_guidelines/icon_design.jd240
-rw-r--r--docs/html/index.jd6
-rw-r--r--docs/html/sdk/1.5_r2/installing.jd8
-rw-r--r--docs/html/sdk/ndk/1.5_r1/index.jd (renamed from docs/html/sdk/ndk/1.5-r1/index.jd)80
-rw-r--r--docs/html/sdk/sdk_toc.cs6
7 files changed, 81 insertions, 263 deletions
diff --git a/docs/html/community/index.jd b/docs/html/community/index.jd
index 91c54aab0dda..eb5887a23e58 100644
--- a/docs/html/community/index.jd
+++ b/docs/html/community/index.jd
@@ -9,7 +9,7 @@ page.title=Community
<p class="note"><strong>Note:</strong> If you are seeking discussion about Android source code (not application development),
then please refer to the <a href="http://source.android.com/discuss">Open Source Project Mailing lists</a>.</p>
-<p style="margin-bottom".5em"><strong>Contents</strong></p>
+<p style="margin-bottom:.5em"><strong>Contents</strong></p>
<ol class="toc">
<li><a href="#BeforeYouPost">Before you post</a></li>
<li><a href="#ApplicationDeveloperLists">Application developer mailing lists</a></li>
diff --git a/docs/html/guide/developing/device.jd b/docs/html/guide/developing/device.jd
index 35c0a1ae0c52..805167826a7d 100644
--- a/docs/html/guide/developing/device.jd
+++ b/docs/html/guide/developing/device.jd
@@ -137,7 +137,7 @@ would on the emulator. There are just a few things to do before you can start.</
<li>If you're developing on Mac OS X, it just works. Skip this step.</li>
<li>If you're developing on Ubuntu Linux, you need to add a rules file:
<ol>
- <li>Login as root and create this file: <code>/etc/udev/rules.d/50-android.rules</code>.
+ <li>Login as root and create this file: <code>/etc/udev/rules.d/51-android.rules</code>.
<p>For Gusty/Hardy, edit the file to read: <br/>
<code>SUBSYSTEM=="usb", SYSFS{idVendor}=="0bb4", MODE="0666"</code></p>
diff --git a/docs/html/guide/practices/ui_guidelines/icon_design.jd b/docs/html/guide/practices/ui_guidelines/icon_design.jd
index 155684a25b93..5f0a278bed92 100644
--- a/docs/html/guide/practices/ui_guidelines/icon_design.jd
+++ b/docs/html/guide/practices/ui_guidelines/icon_design.jd
@@ -25,7 +25,7 @@ application can use the standard icons by referencing them as resources.</li>
<li style="margin-top:4px;"><a href="#dodonts">General guidelines</a></li>
<li><a href="#templatespack">Using the Icon Templates Pack</a></li>
-<li><a href="#file">Icon appendix</a>
+<li><a href="#iconappendix">Icon appendix</a>
<ol>
<li><a href="#launcherapx">Launcher icons</a></li>
<li><a href="#menuapx">Menu icons</a></li>
@@ -989,25 +989,9 @@ simply look at image filenames, which use the format
<table class="image-caption">
<tr>
-
<td class="image-caption-i image-list">
<img src="{@docRoot}images/icon_design/ic_menu_add.png" title="ic_menu_add" alt="Android asset" />
<div class="caption">Add</div></td>
-
-
-<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/ic_menu_archive.png" title="ic_menu_archive" alt="Android asset" />
- <div class="caption">Archive</div></td>
-
-
-<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/ic_menu_attachment.png" title="ic_menu_attachment" alt="Android asset" />
- <div class="caption">Attach</div></td>
-
-
-<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/ic_menu_back.png" title="ic_menu_back" alt="Android asset" />
- <div class="caption">Back</div></td>
<td class="image-caption-i image-list">
@@ -1024,9 +1008,6 @@ simply look at image filenames, which use the format
<img src="{@docRoot}images/icon_design/ic_menu_close_clear_cancel.png" title="ic_menu_close_clear_cancel" alt="Android asset" />
<div class="caption">Clear / Close / Cancel / Discard </div></td>
-</tr>
-<tr>
-
<td class="image-caption-i image-list">
<img src="{@docRoot}images/icon_design/ic_menu_compass.png" title="ic_menu_compass" alt="Android asset" />
@@ -1036,40 +1017,24 @@ simply look at image filenames, which use the format
<td class="image-caption-i image-list">
<img src="{@docRoot}images/icon_design/ic_menu_delete.png" title="ic_menu_delete" alt="Android asset" />
<div class="caption">Delete</div></td>
-
+
<td class="image-caption-i image-list">
<img src="{@docRoot}images/icon_design/ic_menu_directions.png" title="ic_menu_directions" alt="Android asset" />
<div class="caption">Directions</div></td>
-
+
+</tr>
+<tr>
<td class="image-caption-i image-list">
<img src="{@docRoot}images/icon_design/ic_menu_edit.png" title="ic_menu_edit" alt="Android asset" />
<div class="caption">Edit</div></td>
-<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/ic_menu_favorite.png" title="ic_menu_favorite" alt="Android asset" />
- <div class="caption">Favorite</div></td>
-
-
-<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/ic_menu_forward.png" title="ic_menu_forward" alt="Android asset" />
- <div class="caption">Forward</div></td>
-
-
<td class="image-caption-i image-list">
<img src="{@docRoot}images/icon_design/ic_menu_gallery.png" title="ic_menu_gallery" alt="Android asset" />
<div class="caption">Gallery</div></td>
-</tr>
-<tr>
-
-
-<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/ic_menu_goto.png" title="ic_menu_goto" alt="Android asset" />
- <div class="caption">Go to</div></td>
-
<td class="image-caption-i image-list">
<img src="{@docRoot}images/icon_design/ic_menu_help.png" title="ic_menu_help" alt="Android asset" />
@@ -1077,16 +1042,6 @@ simply look at image filenames, which use the format
<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/ic_menu_recent_history.png" title="ic_menu_recent_history" alt="Android asset" />
- <div class="caption">History</div></td>
-
-
-<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/ic_menu_home.png" title="ic_menu_home" alt="Android asset" />
- <div class="caption">Home</div></td>
-
-
-<td class="image-caption-i image-list">
<img src="{@docRoot}images/icon_design/ic_menu_info_details.png" title="ic_menu_info_details" alt="Android asset" />
<div class="caption">Info / details</div></td>
@@ -1094,14 +1049,6 @@ simply look at image filenames, which use the format
<td class="image-caption-i image-list">
<img src="{@docRoot}images/icon_design/ic_menu_mapmode.png" title="ic_menu_mapmode" alt="Android asset" />
<div class="caption">Map mode</div></td>
-
-
-<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/ic_menu_mark.png" title="ic_menu_mark" alt="Android asset" />
- <div class="caption">Mark</div></td>
-
-</tr>
-<tr>
<td class="image-caption-i image-list">
@@ -1113,11 +1060,8 @@ simply look at image filenames, which use the format
<img src="{@docRoot}images/icon_design/ic_menu_more.png" title="ic_menu_more" alt="Android asset" />
<div class="caption">More</div></td>
-
-<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/ic_menu_play_clip.png" title="ic_menu_play_clip" alt="Android asset" />
- <div class="caption">Play</div></td>
-
+</tr>
+<tr>
<td class="image-caption-i image-list">
<img src="{@docRoot}images/icon_design/ic_menu_preferences.png" title="ic_menu_preferences" alt="Android asset" />
@@ -1125,11 +1069,6 @@ simply look at image filenames, which use the format
<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/ic_menu_refresh.png" title="ic_menu_refresh" alt="Android asset" />
- <div class="caption">Refresh</div></td>
-
-
-<td class="image-caption-i image-list">
<img src="{@docRoot}images/icon_design/ic_menu_rotate.png" title="ic_menu_rotate" alt="Android asset" />
<div class="caption">Rotate</div></td>
@@ -1138,9 +1077,6 @@ simply look at image filenames, which use the format
<img src="{@docRoot}images/icon_design/ic_menu_save.png" title="ic_menu_save" alt="Android asset" />
<div class="caption">Save</div></td>
-</tr>
-<tr>
-
<td class="image-caption-i image-list">
<img src="{@docRoot}images/icon_design/ic_menu_send.png" title="ic_menu_send" alt="Android asset" />
@@ -1158,26 +1094,15 @@ simply look at image filenames, which use the format
<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/ic_menu_shuffle.png" title="ic_menu_shuffle" alt="Android asset" />
- <div class="caption">Shuffle</div></td>
-
-
-<td class="image-caption-i image-list">
<img src="{@docRoot}images/icon_design/ic_menu_upload.png" title="ic_menu_upload" alt="Android asset" />
<div class="caption">Upload</div></td>
-
+
+</tr>
+<tr>
<td class="image-caption-i image-list">
<img src="{@docRoot}images/icon_design/ic_menu_view.png" title="ic_menu_view" alt="Android asset" />
<div class="caption">View</div></td>
-
-
-<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/ic_menu_camera_video_view.png" title="ic_menu_camera_video_view" alt="Android asset" />
- <div class="caption">Video</div></td>
-
-</tr>
-<tr>
<td class="image-caption-i image-list">
@@ -1214,131 +1139,21 @@ or simply look at the image filename, which use the format
<tr>
<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/stat_sys_data_connected_3g.png" title="stat_sys_data_connected_3g" alt="Android asset" />
- <div class="caption">3G</div></td>
-
-<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/stat_sys_signal_flightmode.png" title="stat_sys_signal_flightmode" alt="Android asset" />
- <div class="caption">Airplane mode</div></td>
-
-
-<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/stat_notify_alarm.png" title="stat_notify_alarm" alt="Android asset" />
- <div class="caption">Alarm</div></td>
-
-
-<td class="image-caption-i image-list">
<img src="{@docRoot}images/icon_design/stat_sys_data_bluetooth.png" title="stat_sys_data_bluetooth" alt="Android asset" />
<div class="caption">Bluetooth</div></td>
<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/stat_sys_data_bluetooth_connected.png" title="stat_sys_data_bluetooth_connected" alt="Android asset" />
- <div class="caption">Bluetooth connected</div></td>
-
-
-<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/stat_notify_calendar.png" title="stat_notify_calendar" alt="Android asset" />
- <div class="caption">Calendar</div></td>
-
-
-<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/stat_notify_disk_full.png" title="stat_notify_disk_full" alt="Android asset" />
- <div class="caption">Disk full</div></td>
-
-</tr>
-<tr>
-
-<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/stat_sys_data_connected_e.png" title="stat_sys_data_connected_e" alt="Android asset" />
- <div class="caption">EDGE</div></td>
-
-
-<td class="image-caption-i image-list">
<img src="{@docRoot}images/icon_design/stat_notify_email_generic.png" title="stat_notify_email_generic" alt="Android asset" />
<div class="caption">Email</div></td>
<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/stat_notify_email.png" title="stat_notify_email" alt="Android asset" />
- <div class="caption">Gmail</div></td>
-
-
-<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/stat_sys_data_connected_g.png" title="stat_sys_data_connected_g" alt="Android asset" />
- <div class="caption">GPRS</div></td>
-
-
-<td class="image-caption-i image-list">
<img src="{@docRoot}images/icon_design/stat_notify_chat.png" title="stat_notify_chat" alt="Android asset" />
<div class="caption">IM</div></td>
<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/stat_sys_install_complete.png" title="stat_sys_install_complete" alt="Android asset" />
- <div class="caption">Installation complete</div></td>
-
-
-<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/stat_notify_musicplayer.png" title="stat_notify_musicplayer" alt="Android asset" />
- <div class="caption">Music</div></td>
-
-</tr>
-<tr>
-
-<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/stat_sys_r_signal_4.png" title="stat_sys_r_signal_4" alt="Android asset" />
- <div class="caption">Roaming</div></td>
-
-
-<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/stat_sys_signal_4.png" title="stat_sys_signal_4" alt="Android asset" />
- <div class="caption">Signal</div></td>
-
-
-<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/stat_sys_signal_null.png" title="stat_sys_signal_null" alt="Android asset" />
- <div class="caption">Signal unavailable</div></td>
-
-
-<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/stat_sys_ringer_silent_old.png" title="stat_sys_ringer_silent_old" alt="Android asset" />
- <div class="caption">Silent mode</div></td>
-
-
-<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/stat_notify_sms.png" title="stat_notify_sms" alt="Android asset" />
- <div class="caption">SMS/MMS</div></td>
-
-
-<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/stat_sys_speakerphone.png" title="stat_sys_speakerphone" alt="Android asset" />
- <div class="caption">Speaker phone</div></td>
-
-
-<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/stat_notify_sync_anim0.png" title="stat_notify_sync_anim0" alt="Android asset" />
- <div class="caption">Sync</div></td>
-
-</tr>
-<tr>
-
-<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/stat_notify_sync_error.png" title="stat_notify_sync_error" alt="Android asset" />
- <div class="caption">Sync error</div></td>
-
-
-<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/stat_sys_data_usb.png" title="stat_sys_data_usb" alt="Android asset" />
- <div class="caption">USB connected</div></td>
-
-
-<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/stat_sys_ringer_vibrate.png" title="stat_sys_ringer_vibrate" alt="Android asset" />
- <div class="caption">Vibrate</div></td>
-
-
-<td class="image-caption-i image-list">
<img src="{@docRoot}images/icon_design/stat_notify_voicemail.png" title="stat_notify_voicemail" alt="Android asset" />
<div class="caption">Voicemail</div></td>
@@ -1349,32 +1164,6 @@ or simply look at the image filename, which use the format
<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/stat_sys_wifi_signal_4.png" title="stat_sys_wifi_signal_4" alt="Android asset" />
- <div class="caption">WiFi</div></td>
-
-
-<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/stat_notify_wifi_in_range.png" title="stat_notify_wifi_in_range" alt="Android asset" />
- <div class="caption">WiFi network available</div></td>
-
-</tr>
-<tr>
-
-<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/stat_sys_wifi_unavailable.png" title="stat_sys_wifi_unavailable" alt="Android asset" />
- <div class="caption">WiFi unavailable</div></td>
-
-<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/stat_sys_battery_100.png" title="stat_sys_battery_100" alt="Android asset" />
- <div class="caption">Battery 100%</div></td>
-
-
-<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/stat_sys_battery_empty.png" title="stat_sys_battery_empty" alt="Android asset" />
- <div class="caption">Battery empty</div></td>
-
-
-<td class="image-caption-i image-list">
<img src="{@docRoot}images/icon_design/stat_sys_phone_call.png" title="stat_sys_phone_call" alt="Android asset" />
<div class="caption">Call</div></td>
@@ -1383,6 +1172,8 @@ or simply look at the image filename, which use the format
<img src="{@docRoot}images/icon_design/stat_sys_phone_call_forward.png" title="stat_sys_phone_call_forward" alt="Android asset" />
<div class="caption">Call forward</div></td>
+</tr>
+<tr>
<td class="image-caption-i image-list">
<img src="{@docRoot}images/icon_design/stat_sys_phone_call_on_hold.png" title="stat_sys_phone_call_on_hold" alt="Android asset" />
@@ -1390,13 +1181,6 @@ or simply look at the image filename, which use the format
<td class="image-caption-i image-list">
- <img src="{@docRoot}images/icon_design/stat_sys_gps_on.png" title="stat_sys_gps_on" alt="Android asset" />
- <div class="caption">GPS on</div></td>
-
-</tr>
-<tr>
-
-<td class="image-caption-i image-list">
<img src="{@docRoot}images/icon_design/stat_notify_missed_call.png" title="stat_notify_missed_call" alt="Android asset" />
<div class="caption">Missed call</div></td>
diff --git a/docs/html/index.jd b/docs/html/index.jd
index 07d0abe7f6e4..cd55b2196189 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -13,8 +13,10 @@ home=true
<!-- total max width is 520px -->
<img src="/assets/images/home/IO-logo.png" alt="Google I/O Developer Conference 2009" width="242px" />
<div id="announcement" style="width:270px">
- <p>Google I/O is a two-day developer event that will take place May 27-28 at Moscone Center, San Francisco. The agenda includes a number of great sessions on Android topics by team engineers and other developers.</p>
- <p><a href="http://code.google.com/events/io/">Learn more &raquo;</a></p>
+ <p>The Google I/O developer conference took place May 27-28 in San Francisco.
+ If you missed the conference, you can experience the Android sessions
+ by viewing YouTube videos and presentation slides.</p>
+ <p><a href="http://code.google.com/events/io/sessions.html#mobile">See the Mobile sessions at Google I/O &raquo;</a></p>
</div> <!-- end annoucement -->
</div> <!-- end annoucement-block -->
</div><!-- end topAnnouncement -->
diff --git a/docs/html/sdk/1.5_r2/installing.jd b/docs/html/sdk/1.5_r2/installing.jd
index 69b2c1bef533..1530dc56e1db 100644
--- a/docs/html/sdk/1.5_r2/installing.jd
+++ b/docs/html/sdk/1.5_r2/installing.jd
@@ -9,7 +9,7 @@ page.title=Installing the Android SDK
<p>This page describes how to install the Android SDK and set up your
development environment. If you haven't downloaded the SDK, you can
do so from the
-<a href="{@docRoot}sdk/1.5_r2/index.html">Download</a> page. Once you've downloaded
+<a href="index.html">Download</a> page. Once you've downloaded
the SDK, return here.</p>
<p>If you encounter any problems during installation, see the
@@ -19,7 +19,7 @@ this page.</p>
<h4 style="margin-top">Upgrading?</h4>
<p>If you have already developed applications using an earlier version
of the SDK, please read
-<a href="{@docRoot}sdk/1.5_r2/upgrading.html"><strong>Upgrading the
+<a href="upgrading.html"><strong>Upgrading the
SDK</strong></a></b>, instead.
</p>
@@ -27,7 +27,7 @@ SDK</strong></a></b>, instead.
<h2 id="setup">Preparing for Installation</h2>
<p>Before you begin, take a moment to confirm that your development machine meets the
-<a href="{@docRoot}sdk/1.5_r2/requirements.html">System Requirements</a>.
+<a href="requirements.html">System Requirements</a>.
</p>
<p>If you will be developing on Eclipse with the Android Development
@@ -323,7 +323,7 @@ begin developing applications. Here are a few ways you can get started: </p>
<ul>
<li>If JDK is already installed on your development computer, please
take a moment to make sure that it meets the version requirements listed
- in the <a href="{@docRoot}sdk/1.1_r1/requirements.html">System Requirements</a>.
+ in the <a href="{@docRoot}sdk/{@sdkCurrent}/requirements.html">System Requirements</a>.
In particular, note that some Linux distributions may include JDK 1.4 or Gnu
Compiler for Java, both of which are not supported for Android development.</li>
</ul>
diff --git a/docs/html/sdk/ndk/1.5-r1/index.jd b/docs/html/sdk/ndk/1.5_r1/index.jd
index 3d3137c51dfd..7ccbbcd4f5ba 100644
--- a/docs/html/sdk/ndk/1.5-r1/index.jd
+++ b/docs/html/sdk/ndk/1.5_r1/index.jd
@@ -1,32 +1,35 @@
ndk=true
ndk.version=1.5
ndk.rel.id=1
-ndk.date=May 2009
+ndk.date=June 2009
ndk.win_download=android-ndk-1.5_r1-windows.zip
-ndk.win_bytes=22450814
-ndk.win_checksum=7b7836f705ec7e66225794edda34000f
+ndk.win_bytes=22500667
+ndk.win_checksum=e5c53915903d8b81f3e2ea422e2e2717
ndk.mac_download=android-ndk-1.5_r1-darwin-x86.zip
-ndk.mac_bytes=17165450
-ndk.mac_checksum=214ccfd704c0307609fbabeb7bf86acc
+ndk.mac_bytes=17215303
+ndk.mac_checksum=1931f0e182798a4c98924fd87380b5b8
ndk.linux_download=android-ndk-1.5_r1-linux-x86.zip
-ndk.linux_bytes=15976032
-ndk.linux_checksum=808fd4d6a7e45f76d546ba04ab9ef060
-
-ndk.linux_64_download=android-ndk-1.5_r1-linux-x86_64.zip
-ndk.linux_64_bytes=18112300
-ndk.linux_64_checksum=f8664c187b3ae077bcfe2b44294d0758
+ndk.linux_bytes=16025885
+ndk.linux_checksum=80a4e14704ca84c21bf1824cb25fbd8b
page.title=Android 1.5 NDK, Release 1
@jd:body
-<h2>What is the NDK?</h2>
+<h2 id="overview">What is the Android NDK?</h2>
+
+<p>The Android NDK provides tools that allow Android application developers
+to embed components that make use of native code in their Android applications.
+</p>
-<p>The Android 1.5 NDK provides tools that allow Android application developers
-to embed and deploy native code within their Android applications. It
-provides:</p>
+<p>Android applications run in the Dalvik virtual machine. The NDK allows
+developers to implement parts of their applications using native-code languages
+such as C and C++. This can provide benefits to certain classes of applications,
+in the form of reuse of existing code and in some cases increased speed.</p>
+
+<p>The NDK provides:</p>
<ul>
<li>A set of tools and build files used to generate native code libraries from C
@@ -35,18 +38,21 @@ and C++ sources</li>
files (.apks) that can be deployed on Android devices</li>
<li>A set of native system headers and libraries that will be supported in all
future versions of the Android platform, starting from Android 1.5 </li>
+<li>Documentation, samples, and tutorials</li>
</ul>
-<p>This release of the NDK release supports the ARMv5TE machine instruction set
-and provides stable headers for libc (the C library), libm (the Math library)
-and the JNI interface.</p>
+<p>This release of the NDK supports the ARMv5TE machine instruction set
+and provides stable headers for libc (the C library), libm (the Math library),
+the JNI interface, and other libraries.</p>
-<p>Using the NDK may not be relevant for all Android applications. As a
-developer, you will need to balance its benefits (faster execution) and its
-drawbacks (no portability, JNI overhead, no access to system libraries, and
-difficult debugging). Typical good candidates for the NDK are CPU-intensive
-operations that don't allocate too much memory, such as signal processing,
-physics simulation, custom bytecode/instruction interpreters, and so on.</p>
+<p>The NDK will not benefit most applications. As a developer, you will need
+to balance its benefits against its drawbacks; notably, using native code does
+not result in an automatic performance increase, but does always increase
+application complexity. Typical good candidates for the NDK are self-contained,
+CPU-intensive operations that don't allocate much memory, such as signal processing,
+physics simulation, and so on. Simply re-coding a method to run in C usually does
+not result in a large performance increase. The NDK can, however, can be
+an effective way to reuse a large corpus of existing C/C++ code.</p>
<p>Please note that the NDK <em>does not</em> enable you to develop native-only
applications. Android's primary runtime remains the Dalvik virtual machine.</p>
@@ -64,8 +70,11 @@ guaranteed to be supported in all later releases of the platform:</p>
<ul>
<li>libc (C library) headers</li>
-<li>libm (Math library) headers</li>
+<li>libm (math library) headers</li>
<li>JNI interface headers</li>
+<li>libz (Zlib compression) headers</li>
+<li>liblog (Android logging) header</li>
+<li>A Minimal set of headers for C++ support</li>
</ul>
<p>The NDK also provides a build system that lets you work efficiently with your
@@ -97,6 +106,22 @@ usage</li>
defines the native sources you want to compile</li>
<li>APPLICATION-MK.TXT &mdash; describes the use of the Application.mk file,
which describes the native sources required by your Android application</li>
+<li>HOWTO.TXT &mdash; information about common tasks associated with NDK
+development.</li>
+<li>SYSTEM-ISSUES.TXT &mdash; known issues in the Android system images
+that you should be aware of, if you are developing using the NDK. </li>
+<li>STABLE-APIS.TXT &mdash; a complete list of the stable APIs exposed
+by headers in the NDK.</li>
+</ul>
+
+<p>Additionally, the package includes detailed information about the "bionic"
+C library provided with the Android platform that you should be aware of, if you
+are developing using the NDK. You can find the documentation in the
+<code>&lt;ndk&gt;/docs/system/libc/</code> directory:</p>
+
+<ul>
+<li>OVERVIEW.TXT &mdash; provides an overview of the "bionic" C library and the
+features it offers.</li>
</ul>
<h4>Sample applications</h4>
@@ -142,13 +167,14 @@ required.</li>
<li>For all development platforms, GNU Make 3.81 or later is required. Earlier
versions of GNU Make might work but have not been tested.</li>
<li>For Windows, a recent release of <a
-href="http://www.cygwin.com">Cygwin</a> is required.</li>
+href="http://www.cygwin.com">Cygwin</a>, including both the gmake and gcc
+packages, is required. </li>
</ul>
<h4>Android platform compatibility</h4>
<ul>
<li>The native libraries created by the Android NDK can only be used on
-devices running the Android 1.5 platform version or later. This is due to subtle
+devices running the Android 1.5 platform version or later. This is due to
toolchain and ABI related changes that make the native libraries incompatible
with 1.0 and 1.1 system images.</li>
<li>For this reason, you should use native libraries produced with the NDK in
diff --git a/docs/html/sdk/sdk_toc.cs b/docs/html/sdk/sdk_toc.cs
index 2079dd8a62f3..ce1ee6e084ab 100644
--- a/docs/html/sdk/sdk_toc.cs
+++ b/docs/html/sdk/sdk_toc.cs
@@ -27,6 +27,12 @@
</ul>
</li>
<li>
+ <h2>Native Development Tools</h2>
+ <ul>
+ <li><a href="<?cs var:toroot ?>sdk/ndk/1.5_r1/index.html">Android 1.5 NDK, r1</a></li>
+ </ul>
+ </li>
+ <li>
<h2>Previous SDK Releases</h2>
<ul>
<li><a href="<?cs var:toroot ?>sdk/1.1_r1/index.html">Android 1.1 SDK, r1</a></li>