Merge "Fix struct initializer for balls." into honeycomb
diff --git a/docs/html/guide/appendix/media-formats.jd b/docs/html/guide/appendix/media-formats.jd
index 8709994..bac6bf4 100644
--- a/docs/html/guide/appendix/media-formats.jd
+++ b/docs/html/guide/appendix/media-formats.jd
@@ -1,29 +1,72 @@
page.title=Android Supported Media Formats
@jd:body
-<p>The <a href="#core">Core Media Formats</a> table below describes the media format support built into the Android platform. Note that any given mobile device may provide support for additional formats or file types not listed in the table. </p>
+<div id="qv-wrapper">
+<div id="qv">
-<p>As an application developer, you are free to make use of any media codec that is available on any Android-powered device, including those provided by the Android platform and those that are device-specific.</p>
+<h2>In this document</h2>
+
+<ol>
+<li><a href="#network">Network Protocols</a></li>
+<li><a href="#core">Core Media Formats</a></li>
+<li><a href="#recommendations">Video Encoding Recommendations</a></li>
+</ol>
+
+<h2>See also</h2>
+<ol>
+<li><a href="{@docRoot}guide/topics/media/index.html">Audio and Video</a></li>
+</ol>
+
+<h2>Key classes</h2>
+<ol>
+<li>{@link android.media.MediaPlayer MediaPlayer}</li>
+<li>{@link android.media.MediaRecorder MediaRecorder}</li>
+</ol>
+
+</div>
+</div>
+
+<p>This document describes the media codec, container, and network protocol support provided by the Android platform.</p>
+
+<p>As an application developer, you are free to make use of any media codec that is available on any Android-powered device, including those provided by the Android platform and those that are device-specific. <strong>However, it is a best practice to use media encoding profiles that are device-agnostic</strong>.</p>
+
+
+<h2 id="network">Network Protocols</h2>
+
+<p>The following network protocols are supported for audio and video playback:</p>
+
+<ul>
+ <li>RTSP (RTP, SDP)</li>
+ <li>HTTP progressive streaming</li>
+ <li>HTTP live streaming <a href="http://tools.ietf.org/html/draft-pantos-http-live-streaming-05">draft protocol</a> (Android 3.0 and above)</li>
+</ul>
+
+<p class="note"><strong>Note:</strong> HTTPS is not supported at this time.</p>
+
<h2 id="core">Core Media Formats</h2>
+<p>The table below describes the media format support built into the Android platform. Note that any given mobile device may provide support for additional formats or file types not listed in the table.</p>
+
+<p class="note"><strong>Note:</strong> Media codecs that are not guaranteed to be available on all Android platform versions are accordingly noted in parentheses—for example "(Android 3.0+)".</p>
+
<table>
<tbody>
<tr>
<th>Type</th>
-<th>Format</th>
+<th>Format / Codec</th>
<th>Encoder</th>
<th>Decoder</th>
<th>Details</th>
-<th>File Type(s) Supported</th>
+<th>Supported File Type(s) / Container Formats</th>
</tr>
<tr>
<td rowspan="9">Audio</td>
<td>AAC LC/LTP</td>
-<td style="text-align: center;">X</td>
-<td style="text-align: center;">X</td>
+<td style="text-align: center;"><big>•</big></td>
+<td style="text-align: center;"><big>•</big></td>
<td rowspan="3">Mono/Stereo content in any combination of standard bit rates up to 160 kbps and sampling rates from 8 to 48kHz</td>
<td rowspan="3">3GPP (.3gp) and MPEG-4 (.mp4, .m4a). No support for raw AAC (.aac)</td>
</tr>
@@ -31,19 +74,19 @@
<tr>
<td>HE-AACv1 (AAC+)</td>
<td> </td>
-<td style="text-align: center;">X</td>
+<td style="text-align: center;"><big>•</big></td>
</tr>
<tr>
<td>HE-AACv2 (enhanced AAC+)</td>
<td> </td>
-<td style="text-align: center;">X</td>
+<td style="text-align: center;"><big>•</big></td>
</tr>
<tr>
<td>AMR-NB</td>
-<td style="text-align: center;">X</td>
-<td style="text-align: center;">X</td>
+<td style="text-align: center;"><big>•</big></td>
+<td style="text-align: center;"><big>•</big></td>
<td>4.75 to 12.2 kbps sampled @ 8kHz</td>
<td>3GPP (.3gp)
</td>
@@ -51,8 +94,8 @@
<tr>
<td>AMR-WB</td>
-<td style="text-align: center;">X</td>
-<td style="text-align: center;">X</td>
+<td style="text-align: center;"><big>•</big></td>
+<td style="text-align: center;"><big>•</big></td>
<td>9 rates from 6.60 kbit/s to 23.85 kbit/s sampled @ 16kHz</td>
<td>3GPP (.3gp)</td>
</tr>
@@ -60,7 +103,7 @@
<tr>
<td>MP3</td>
<td> </td>
-<td style="text-align: center;">X</td>
+<td style="text-align: center;"><big>•</big></td>
<td>Mono/Stereo 8-320Kbps constant (CBR) or variable bit-rate (VBR)
</td>
<td>MP3 (.mp3)</td>
@@ -69,7 +112,7 @@
<tr>
<td>MIDI</td>
<td> </td>
-<td style="text-align: center;">X</td>
+<td style="text-align: center;"><big>•</big></td>
<td>MIDI Type 0 and 1. DLS Version 1 and 2. XMF and Mobile XMF. Support for ringtone formats RTTTL/RTX, OTA, and iMelody </td>
<td>Type 0 and 1 (.mid, .xmf, .mxmf). Also RTTTL/RTX (.rtttl, .rtx), OTA (.ota), and iMelody (.imy)</td>
</tr>
@@ -77,7 +120,7 @@
<tr>
<td>Ogg Vorbis</td>
<td> </td>
-<td style="text-align: center;">X</td>
+<td style="text-align: center;"><big>•</big></td>
<td> </td>
<td>Ogg (.ogg)</td>
</tr>
@@ -85,7 +128,7 @@
<tr>
<td>PCM/WAVE</td>
<td> </td>
-<td style="text-align: center;">X</td>
+<td style="text-align: center;"><big>•</big></td>
<td>8- and 16-bit linear PCM (rates up to limit of hardware)</td>
<td>WAVE (.wav)</td>
</tr>
@@ -93,8 +136,8 @@
<tr>
<td rowspan="4">Image</td>
<td>JPEG</td>
-<td style="text-align: center;">X</td>
-<td style="text-align: center;">X</td>
+<td style="text-align: center;"><big>•</big></td>
+<td style="text-align: center;"><big>•</big></td>
<td>Base+progressive</td>
<td>JPEG (.jpg)</td>
</tr>
@@ -102,15 +145,15 @@
<tr>
<td>GIF</td>
<td> </td>
-<td style="text-align: center;">X</td>
+<td style="text-align: center;"><big>•</big></td>
<td> </td>
<td>GIF (.gif)</td>
</tr>
<tr>
<td>PNG</td>
-<td style="text-align: center;">X</td>
-<td style="text-align: center;">X</td>
+<td style="text-align: center;"><big>•</big></td>
+<td style="text-align: center;"><big>•</big></td>
<td> </td>
<td>PNG (.png)</td>
</tr>
@@ -118,33 +161,33 @@
<tr>
<td>BMP</td>
<td> </td>
-<td style="text-align: center;">X</td>
+<td style="text-align: center;"><big>•</big></td>
<td> </td>
<td>BMP (.bmp)</td>
</tr>
-
+
<tr>
<td rowspan="3">Video</td>
<td>H.263</td>
-<td style="text-align: center;">X</td>
-<td style="text-align: center;">X</td>
+<td style="text-align: center;"><big>•</big></td>
+<td style="text-align: center;"><big>•</big></td>
<td> </td>
<td>3GPP (.3gp) and MPEG-4 (.mp4)</td>
</tr>
<tr>
<td>H.264 AVC</td>
-<td style="text-align: center;"></td>
-<td style="text-align: center;">X</td>
-<td> </td>
+<td style="text-align: center;" nowrap><big>•</big><br><small>(Android 3.0+)</small></td>
+<td style="text-align: center;"><big>•</big></td>
+<td>Baseline Profile (BP)</td>
<td>3GPP (.3gp) and MPEG-4 (.mp4)</td>
</tr>
<tr>
<td>MPEG-4 SP</td>
<td> </td>
-<td style="text-align: center;">X</td>
+<td style="text-align: center;"><big>•</big></td>
<td> </td>
<td>3GPP (.3gp)</td>
</tr>
@@ -152,7 +195,83 @@
</tbody></table>
+<h2 id="recommendations">Video Encoding Recommendations</h2>
+<p>Below are examples of video encoding profiles and parameters that the Android media framework supports for playback.</p>
+<ul>
+ <li><strong>Lower quality video</strong><br>
+ <table style="margin-top: 4px">
+ <tbody>
+ <tr>
+ <th>Video codec</th>
+ <td>H.264 Baseline Profile</th>
+ </tr>
+ <tr>
+ <th>Video resolution</th>
+ <td>176 x 144 px</th>
+ </tr>
+ <tr>
+ <th>Video frame rate</th>
+ <td>12 fps</th>
+ </tr>
+ <tr>
+ <th>Video bitrate</th>
+ <td>56 Kbps</th>
+ </tr>
+ <tr>
+ <th>Audio codec</th>
+ <td>AAC-LC</th>
+ </tr>
+ <tr>
+ <th>Audio channels</th>
+ <td>1 (mono)</th>
+ </tr>
+ <tr>
+ <th>Audio bitrate</th>
+ <td>24 Kbps</th>
+ </tr>
+ </tbody>
+ </table>
+ </li>
+ <li><strong>Higher quality video</strong><br>
+
+ <table style="margin-top: 4px">
+ <tbody>
+ <tr>
+ <th>Video codec</th>
+ <td>H.264 Baseline Profile</th>
+ </tr>
+ <tr>
+ <th>Video resolution</th>
+ <td>480 x 360 px</th>
+ </tr>
+ <tr>
+ <th>Video frame rate</th>
+ <td>30 fps</th>
+ </tr>
+ <tr>
+ <th>Video bitrate</th>
+ <td>500 Kbps</th>
+ </tr>
+ <tr>
+ <th>Audio codec</th>
+ <td>AAC-LC</th>
+ </tr>
+ <tr>
+ <th>Audio channels</th>
+ <td>2 (stereo)</th>
+ </tr>
+ <tr>
+ <th>Audio bitrate</th>
+ <td>128 Kbps</th>
+ </tr>
+ </tbody>
+ </table>
+
+ </li>
+</ul>
+
+<p>In addition to the encoding parameters above, a device's available video recording profiles can be used as a proxy for media playback capabilities. These profiles can be inspected using the {@link android.media.CamcorderProfile CamcorderProfile} class, which is available since API level 8.</p>
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs
index 8648990..c52fd6a 100644
--- a/docs/html/guide/guide_toc.cs
+++ b/docs/html/guide/guide_toc.cs
@@ -731,7 +731,7 @@
</a></li>
<li><a href="<?cs var:toroot ?>guide/appendix/media-formats.html">
<span class="en">Supported Media Formats</span>
- </a></li>
+ </a> <span class="new">updated</span></li>
<li><a href="<?cs var:toroot ?>guide/appendix/g-app-intents.html">
<span class="en">Intents List: Google Apps</span>
</a></li>
diff --git a/docs/html/guide/samples/index.jd b/docs/html/guide/samples/index.jd
index bd9ea52..4b9334f 100644
--- a/docs/html/guide/samples/index.jd
+++ b/docs/html/guide/samples/index.jd
@@ -4,11 +4,11 @@
<script type="text/javascript">
- window.location = toRoot + "resources/samples/index.html";
+ window.location = toRoot + "resources/browser.html?tag=sample";
</script>
<p><strong>This document has moved. Please go to <a
-href="http://developer.android.com/resources/samples/index.html">List of Sample
+href="http://developer.android.com/resources/browser.html?tag=sample">List of Sample
Apps</a>.</strong></p>
diff --git a/docs/html/resources/resources-data.js b/docs/html/resources/resources-data.js
index beffbfe..febdb9a 100644
--- a/docs/html/resources/resources-data.js
+++ b/docs/html/resources/resources-data.js
@@ -25,7 +25,8 @@
'search': 'Search',
'testing': 'Testing',
'ui': 'User Interface',
- 'web': 'Web Content'
+ 'web': 'Web Content',
+ 'widgets': 'App Widgets'
},
misc: {
'external': 'External',
@@ -345,17 +346,17 @@
///////////////////
{
- tags: ['sample'],
+ tags: ['sample', 'new'],
path: 'samples/AccelerometerPlay/index.html',
title: {
en: 'Accelerometer Play'
},
description: {
- en: ''
+ en: 'An example of using the accelerometer to integrate the device\'s acceleration to a position using the Verlet method. This is illustrated with a very simple particle system comprised of a few iron balls freely moving on an inclined wooden table. The inclination of the virtual table is controlled by the device\'s accelerometer.'
}
},
{
- tags: ['sample'],
+ tags: ['sample', 'new', 'accessibility'],
path: 'samples/AccessibilityService/index.html',
title: {
en: 'Accessibility Service'
@@ -565,7 +566,7 @@
}
},
{
- tags: ['sample', 'new', 'newfeature'],
+ tags: ['sample', 'new', 'newfeature', 'widgets'],
path: 'samples/StackWidget/index.html',
title: {
en: 'StackView App Widget'
@@ -595,7 +596,7 @@
}
},
{
- tags: ['sample', 'ui'],
+ tags: ['sample', 'ui', 'widgets'],
path: 'samples/Wiktionary/index.html',
title: {
en: 'Wiktionary'
@@ -605,7 +606,7 @@
}
},
{
- tags: ['sample', 'ui'],
+ tags: ['sample', 'ui', 'widgets'],
path: 'samples/WiktionarySimple/index.html',
title: {
en: 'Wiktionary (Simplified)'
diff --git a/docs/html/resources/samples/index.jd b/docs/html/resources/samples/index.jd
index beecd67..acb80e82 100644
--- a/docs/html/resources/samples/index.jd
+++ b/docs/html/resources/samples/index.jd
@@ -1,138 +1,11 @@
page.title=List of Sample Apps
@jd:body
-<p>The list below provides a summary of the sample applications that are
-available with the Android SDK. Using the links on this page, you can view
-the source files of the sample applications in your browser. </p>
+<script type="text/javascript">
+ window.location = toRoot + "resources/browser.html?tag=sample";
+</script>
-<p>You can also download the source of these samples into your SDK, then
-modify and reuse it as you need. For more information, see <a
-href="{@docRoot}resources/samples/get.html">Getting the Samples</a>.</p>
-<!--
-<div class="special">
- <p>Some of the samples in this listing may not yet be available in the
- SDK. To ensure that you have the latest versions of the samples, you can
- <a href="{@docRoot}shareables/latest_samples.zip">download the samples pack</a>
- as a .zip archive.</p>
-</div>
--->
-<dl>
-
- <dt><a href="AccelerometerPlay/index.html">Accelerometer Play</a></dt>
- <dd>An example that demonstrates how to use accelerometer readings
- in an application.</dd>
-
- <dt><a href="AccessibilityService/index.html">Accessibility Service</a></dt>
- <dd>An example that demonstrates the use of accessibility APIs.</dd>
-
- <dt><a href="ApiDemos/index.html">API Demos</a></dt>
- <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>A 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>
-
- <dt><a href="BusinessCard/index.html">BusinessCard</a></dt>
- <dd>An application that demonstrates how to launch the built-in contact
- picker from within an activity. This sample also uses reflection to ensure
- that the correct version of the contacts API is used, depending on which
- API level the application is running under.</dd>
-
- <dt><a href="ContactManager/index.html">Contact Manager</a></dt>
- <dd>An application that demonstrates how to query the system contacts provider
- using the <code>ContactsContract</code> API, as
- well as insert contacts into a specific account.</dd>
-
- <dt><a href="Home/index.html">Home</a></dt>
- <dd>A home screen replacement application.</dd>
-
- <dt><a href="JetBoy/index.html">JetBoy</a></dt>
- <dd>A game that demonstrates the SONiVOX JET interactive music technology,
- with {@link android.media.JetPlayer}.</dd>
-
- <dt><a href="CubeLiveWallpaper/index.html">Live Wallpaper</a></dt>
- <dd>An application that demonstrates how to create a live wallpaper and
- bundle it in an application that users can install on their devices.</dd>
-
- <dt><a href="LunarLander/index.html">Lunar Lander</a></dt>
- <dd>A classic Lunar Lander game.</dd>
-
- <dt><a href="MultiResolution/index.html">Multiple Resolutions</a></dt>
- <dd>A sample application that shows how to use resource directory qualifiers to
- provide different resources for different screen configurations.</dd>
-
- <dt><a href="NotePad/index.html">Note Pad</a></dt>
- <dd>An application for saving notes. Similar (but not identical) to the
- <a href="{@docRoot}resources/tutorials/notepad/index.html">Notepad tutorial</a>.</dd>
-
- <dt><a href="SampleSyncAdapter/index.html">SampleSyncAdapter</a></dt>
- <dd>Demonstrates how an application can communicate with a
-cloud-based service and synchronize its data with data stored locally in a
-content provider. The sample uses two related parts of the Android framework
-— the account manager and the synchronization manager (through a sync
-adapter).</dd>
-
- <dt><a href="SearchableDictionary/index.html">Searchable Dictionary</a></dt>
- <dd>A sample application that demonstrates Android's search framework,
- including how to provide search suggestions for Quick Search Box.</dd>
-
- <dt><a href="SipDemo/index.html">SIP Demo</a></dt>
- <dd>An application that demonstrates how to make an internet-based call using the SIP
- API.</dd>
-
- <dt><a href="Snake/index.html">Snake</a></dt>
- <dd>An implementation of the classic game "Snake."</dd>
-
- <dt><a href="SoftKeyboard/index.html">Soft Keyboard</a></dt>
- <dd>An example of writing an input method for a software keyboard.</dd>
-
- <dt><a href="Spinner/index.html">Spinner</a></dt>
- <dd>
- A simple application that serves as an application-under-test for the
- SpinnerTest sample application.
- </dd>
- <dt><a href="SpinnerTest/index.html">SpinnerTest</a></dt>
- <dd>
- An example test application that contains test cases run against the
- Spinner sample application.
- To learn more about the application and how to run it,
- please read the
- <a href="{@docRoot}resources/tutorials/testing/activity_test.html">Activity Testing</a> tutorial.
- </dd>
- <dt><a href="TicTacToeLib/index.html">TicTacToeLib</a></dt>
- <dd>
- An example of an Android library project that provides a game-play
- Activity to any dependent application project. For an example of
- how an application can use the code and resources in an Android
- library project, see the <a
- href="{@docRoot}resources/samples/TicTacToeMain/index.html">TicTacToeMain</a>
- sample application.
- </dd>
- <dt><a href="TicTacToeMain/index.html">TicTacToeMain</a></dt>
- <dd>
- An example of an Android application that makes use of code and
- resources provided in an Android library project. Specifically, this
- application uses code and resources provided in the <a
- href="{@docRoot}resources/samples/TicTacToeLib/index.html">TicTacToeLib</a> library project.
- </dd>
- <dt><a href="Wiktionary/index.html">Wiktionary</a></dt>
- <dd>An example of creating interactive widgets for display on the Android
- home screen.</dd>
-
- <dt><a href="WiktionarySimple/index.html">Wiktionary (Simplified)</a></dt>
- <dd>A simple Android home screen widgets example.</dd>
-</dl>
-
-
-<div class="special">
-<p>For more sample applications, check out
-<a href="http://code.google.com/p/apps-for-android/">apps-for-android</a>, a
-collection of open source applications that demonstrate various Android APIs.
-</p>
-</div>
-
+<p><strong>This document has moved. Please go to <a
+href="http://developer.android.com/resources/browser.html?tag=sample">List of Sample
+Apps</a>.</strong></p>
diff --git a/docs/html/sdk/eclipse-adt.jd b/docs/html/sdk/eclipse-adt.jd
index 0bb830c..c283167 100644
--- a/docs/html/sdk/eclipse-adt.jd
+++ b/docs/html/sdk/eclipse-adt.jd
@@ -28,7 +28,7 @@
<p>Android Development Tools (ADT) is a plugin for the Eclipse IDE
that is designed to give you a powerful, integrated environment in which
-to build Android applications. </p>
+to build Android applications.</p>
<p>ADT extends the capabilities of Eclipse to let you quickly set up new Android
projects, create an application UI, add components based on the Android
@@ -95,10 +95,56 @@
</style>
+
<div class="toggleable opened">
<a href="#" onclick="return toggleDiv(this)">
<img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-img" height="9px"
width="9px" />
+ADT 10.0.0</a> <em>(February 2011)</em>
+ <div class="toggleme">
+
+<dl>
+
+<dt>Dependencies:</dt>
+
+<dd>ADT 10.0.0 is designed for use with SDK Tools r10. If you haven't
+already installed SDK Tools r10 into your SDK, use the Android SDK and AVD Manager to do
+so.</dd>
+
+<dt>General notes:</dt>
+<dd>
+ <ul>
+ <li>The tools now automatically generate Java Programming Language source files (in the <code>gen/</code> directory) and
+ bytecode (in the <code>res/raw/</code> directory) from your <code>.rs</code> files.</li>
+ <li>A Binary XML editor has been added.</li>
+ <li>Traceview is now integrated into the Eclipse UI (<a href="http://tools.android.com/recent/traceviewineclipse">details</a>).</li>
+ <li>The "Go To Declaration" feature for XML and <code>.java</code> files quickly show all the matches in the project
+ and allows you jump to specific items such as string translations or <code>onClick</code> handlers.</li>
+ <li>The Resource Chooser can create items such as dimensions, integers, ids, and booleans.</li>
+ <li>Improvements to the Visual Layout Editor:
+ <ul>
+ <li>A new Palette with categories and rendering previews
+ (<a href="http://tools.android.com/recent/newpalette">details</a>).</li>
+ <li>A Layout action bar.</li>
+ <li>When the Android 3.0 rendering library is selected, layouts render more like they do on devices.
+ This includes rendering of status and title bars to more accurately reflect the actual
+ screen space available to applications.</li>
+ <li>Zoom improvements such as fit to view, persistent scale, and keyboard access.
+ (<a href="http://tools.android.com/recent/zoomimprovements">details</a>).</li>
+ <li>Further improvements to <code><merge></code> layouts, as well as layouts with gesture overlays.</li>
+ <li>Improved rendering error diagnostics.</li>
+ </ul>
+ </li>
+ </ul>
+</dd>
+</dl>
+</div>
+</div>
+
+<div class="toggleable closed">
+ <a href="#" onclick="return toggleDiv(this)">
+ <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-img" height="9px"
+width="9px" />
ADT 9.0.0</a> <em>(January 2011)</em>
<div class="toggleme">
diff --git a/docs/html/sdk/ndk/index.jd b/docs/html/sdk/ndk/index.jd
index 2f53305..10887c6 100644
--- a/docs/html/sdk/ndk/index.jd
+++ b/docs/html/sdk/ndk/index.jd
@@ -59,12 +59,60 @@
}
</style>
-
<div class="toggleable open">
<a href="#"
onclick="return toggleDiv(this)"><img src="{@docRoot}assets/images/triangle-opened.png"
class="toggle-img"
height="9px"
+ width="9px" /> Android NDK, Revision 6</a> <em>(February 2011)</em>
+
+ <div class="toggleme">
+ <p>This release of the NDK introduces the following header files:</p>
+ <ul>
+ <li><p><code><android/asset_manager.h></code>: Allows access to assets
+ using 64-bit file offsets and sizes. This is useful for very large assets that exceed
+ 2GB, as required by some games. The following APIs are provided:<p>
+ <ul>
+ <li><code>AAsset_getLength64</code></li>
+ <li><code>AAsset_getRemainingLength64</code></li>
+ <li><code>AAsset_openFileDescriptor64</code></li>
+ <li><code>AAsset_seek64</code></li>
+ </ul>
+ </li>
+
+ <li><code><android/input.h></code>: Provides the following AMETA_XXX constants
+ that are related to the new input framework in Honeycomb:
+<pre>
+AMETA_FUNCTION_ON = 0x08,
+AMETA_CTRL_ON = 0x1000,
+AMETA_CTRL_LEFT_ON = 0x2000,
+AMETA_CTRL_RIGHT_ON = 0x4000,
+AMETA_META_ON = 0x10000,
+AMETA_META_LEFT_ON = 0x20000,
+AMETA_META_RIGHT_ON = 0x40000,
+AMETA_CAPS_LOCK_ON = 0x100000,
+AMETA_NUM_LOCK_ON = 0x200000,
+AMETA_SCROLL_LOCK_ON = 0x400000,
+</pre>
+ </li>
+
+ <li><code><android/keycodes></code>: Provides <code>AKEYCODE_XXX</code>
+ constants that are related to the new input framework in Honeycomb.
+ </li>
+
+ <li><code><android/native_activity.h></code>: Adds a new field to the
+ system-allocated <code>ANativeActivity</code> structure named <code>obbPath</code> that
+ contains the path of your application's OBB files, if any.
+ </li>
+ </ul>
+ </div>
+ </div>
+
+<div class="toggleable closed">
+ <a href="#"
+ onclick="return toggleDiv(this)"><img src="{@docRoot}assets/images/triangle-closed.png"
+ class="toggle-img"
+ height="9px"
width="9px" /> Android NDK, Revision 5b</a> <em>(January 2011)</em>
<div class="toggleme">
diff --git a/docs/html/sdk/tools-notes.jd b/docs/html/sdk/tools-notes.jd
index 97ca8ab0..28d8bdd 100644
--- a/docs/html/sdk/tools-notes.jd
+++ b/docs/html/sdk/tools-notes.jd
@@ -65,6 +65,34 @@
<div class="toggleable opened">
<a href="#" onclick="return toggleDiv(this)">
<img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-img" height="9px" width="9px" />
+SDK Tools, Revision 10</a> <em>(February 2011)</em>
+ <div class="toggleme">
+ <dl>
+<dt>Dependencies:</dt>
+<dd>
+<p>If you are developing in Eclipse with ADT, note that the SDK Tools r10 is
+designed for use with ADT 10.0.0 and later. After installing SDK Tools r10, we
+highly recommend updating your ADT Plugin to 10.0.0.</p>
+
+<p>If you are developing outside Eclipse, you must have <a href="http://ant.apache.org/">Apache
+Ant</a> 1.8 or later.</p>
+
+<dt>General notes:</dt>
+<dd>
+ <ul>
+ <li>The tools now automatically generate Java Programming Language source files (in the <code>gen</code> directory) and
+ bytecode (in the <code>res/raw</code> directory) from your native <code>.rs</code> files</li>
+ </ul>
+</dd>
+</dl>
+</div>
+</div>
+
+
+
+<div class="toggleable closed">
+ <a href="#" onclick="return toggleDiv(this)">
+ <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-img" height="9px" width="9px" />
SDK Tools, Revision 9</a> <em>(January 2011)</em>
<div class="toggleme">
<dl>