Merge "Doc change: Add doc for GL texture declaration/filtering, hardwareAccelerated manifest attr." into honeycomb
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index a91829c..7ac7ad8 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -341,7 +341,7 @@
android:description="@string/permdesc_bluetooth"
android:label="@string/permlab_bluetooth" />
- <!-- Allows applications to directly communicate over NFC -->
+ <!-- Allows applications to perform I/O operations over NFC -->
<permission android:name="android.permission.NFC"
android:permissionGroup="android.permission-group.NETWORK"
android:protectionLevel="dangerous"
diff --git a/docs/html/guide/appendix/media-formats.jd b/docs/html/guide/appendix/media-formats.jd
index bac6bf4..8509466 100644
--- a/docs/html/guide/appendix/media-formats.jd
+++ b/docs/html/guide/appendix/media-formats.jd
@@ -168,7 +168,7 @@
<tr>
-<td rowspan="3">Video</td>
+<td rowspan="4">Video</td>
<td>H.263</td>
<td style="text-align: center;"><big>•</big></td>
<td style="text-align: center;"><big>•</big></td>
@@ -192,6 +192,14 @@
<td>3GPP (.3gp)</td>
</tr>
+<tr>
+<td>VP8</td>
+<td> </td>
+<td style="text-align: center;"><big>•</big><br><small>(Android 2.3.3+)</small></td>
+<td> </td>
+<td><a href="http://www.webmproject.org/">WebM</a> (.webm)</td>
+</tr>
+
</tbody></table>
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs
index d1d1212..c839469 100644
--- a/docs/html/guide/guide_toc.cs
+++ b/docs/html/guide/guide_toc.cs
@@ -60,7 +60,7 @@
<li class="toggle-list">
<div><a href="<?cs var:toroot ?>guide/topics/fundamentals/activities.html">
<span class="en">Activities</span>
- </a> <span class="new">new!</span></div>
+ </a> <span class="new-child">new!</span></div>
<ul>
<li><a href="<?cs var:toroot ?>guide/topics/fundamentals/fragments.html">
<span class="en">Fragments</span>
@@ -69,18 +69,17 @@
<span class="en">Loaders</span>
</a> <span class="new">new!</span></li>
<li><a href="<?cs var:toroot ?>guide/topics/fundamentals/tasks-and-back-stack.html">
- <span class="en">Tasks and Back Stack</span>
- </a> <span class="new">new!</span></li>
+ <span class="en">Tasks and Back Stack</span></a></li>
</ul>
</li>
<li class="toggle-list">
<div><a href="<?cs var:toroot ?>guide/topics/fundamentals/services.html">
<span class="en">Services</span>
- </a> <span class="new">new!</span></div>
+ </a></div>
<ul>
<li><a href="<?cs var:toroot ?>guide/topics/fundamentals/bound-services.html">
<span class="en">Bound Services</span>
- </a> <span class="new">new!</span></li>
+ </a></li>
</ul>
</li>
<li><a href="<?cs var:toroot ?>guide/topics/providers/content-providers.html">
@@ -91,7 +90,7 @@
</a></li>
<li><a href="<?cs var:toroot ?>guide/topics/fundamentals/processes-and-threads.html">
<span class="en">Processes and Threads</span>
- </a> <span class="new">new!</span></li>
+ </a></li>
</ul>
@@ -100,7 +99,7 @@
<div><a href="<?cs var:toroot ?>guide/topics/ui/index.html">
<span class="en">User Interface</span>
</a>
- <span class="new">more!</span></div>
+ <span class="new-child">new!</span></div>
<ul>
<li><a href="<?cs var:toroot ?>guide/topics/ui/declaring-layout.html">
<span class="en">Declaring Layout</span>
@@ -130,10 +129,9 @@
</a></li>
</ul>
</li>
- <li>
- <a href="<?cs var:toroot ?>guide/topics/ui/drag-drop.html">
- Dragging and Dropping
- </a><span class="new">new!</span>
+ <li><a href="<?cs var:toroot ?>guide/topics/ui/drag-drop.html">
+ <span class="en">Dragging and Dropping</span>
+ </a> <span class="new">new!</span>
</li>
<li><a href="<?cs var:toroot ?>guide/topics/ui/themes.html">
<span class="en">Applying Styles and Themes</span>
@@ -241,7 +239,7 @@
<div><a href="<?cs var:toroot ?>guide/topics/graphics/index.html">
<span class="en">Graphics</span>
</a>
- <span class="new">more!</span></div>
+ <span class="new-child">new!</span></div>
<ul>
<li><a href="<?cs var:toroot ?>guide/topics/graphics/2d-graphics.html">
<span class="en">2D Graphics</span>
@@ -251,10 +249,10 @@
</a></li>
<li><a href="<?cs var:toroot ?>guide/topics/graphics/renderscript.html">
<span class="en">3D with Renderscript</span>
- </a><span class="new">new!</span></li>
+ </a> <span class="new">new!</span></li>
<li><a href="<?cs var:toroot ?>guide/topics/graphics/animation.html">
<span class="en">Property Animation</span>
- </a><span class="new">new!</span></li>
+ </a> <span class="new">new!</span></li>
<li><a href="<?cs var:toroot ?>guide/topics/graphics/view-animation.html">
<span class="en">View Animation</span>
</a></li>
@@ -655,6 +653,9 @@
<li><a href="<?cs var:toroot ?>guide/practices/screens_support.html">
<span class="en">Supporting Multiple Screens</span>
</a></li>
+ <li><a href="<?cs var:toroot ?>guide/practices/optimizing-for-3.0.html">
+ <span class="en">Optimizing Apps for Android 3.0</span>
+ </a> <span class="new">new!</span></li>
<li class="toggle-list">
<div><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/index.html">
<span class="en">UI Guidelines</span>
diff --git a/docs/html/sdk/android-3.0-optimize.jd b/docs/html/guide/practices/optimizing-for-3.0.jd
similarity index 100%
rename from docs/html/sdk/android-3.0-optimize.jd
rename to docs/html/guide/practices/optimizing-for-3.0.jd
diff --git a/docs/html/guide/topics/nfc/index.jd b/docs/html/guide/topics/nfc/index.jd
index 3992099..c4917b4 100644
--- a/docs/html/guide/topics/nfc/index.jd
+++ b/docs/html/guide/topics/nfc/index.jd
@@ -31,29 +31,33 @@
</div>
</div>
- <p>Near Field Communication (NFC) is a set of short-range wireless technologies, similar to RFID.
- It typically requires a distance of 4 cm or less and operates at 13.56mhz and at rates ranging
- from 106 kbit/s to 848 kbit/s. NFC communication always involves an initiator and a target. The
- initiator actively generates an RF field that can power a passive target. This enables NFC
- targets to take very simple form factors such as tags, stickers or cards that do not require
- power. NFC peer-to-peer communication is also possible, where both devices are powered.</p>
-
- <p>Compared to other wireless technologies such as Bluetooth or WiFi, NFC provides much lower
- bandwidth and range, but provides low-cost, un-powered targets and do not require discovery or
- pairing. Users interact with NFC tags with just a tap. Targets can range in complexity. Simple
- tags just offer read and write capabilities, sometimes with one-time programmable areas to make
- the card read-only. More complex tags offer math operations, and have cryptographic hardware to
- authenticate access to a sector. The most sophisticated tags contain operating environments,
- allowing complex interactions with applets that are running on the tag.</p>
-
- <p>An Android device with NFC hardware typically acts as an initiator. This mode is also known as
- NFC reader/writer. The device actively looks for NFC tags and starts activities to handle them in
- this mode. In Android 2.3.3, devices also have some limited peer-to-peer support.</p>
+ <p>Near Field Communication (NFC) is a set of short-range wireless technologies, typically
+ requiring a distance of 4cm or less. NFC operates at 13.56mhz, and at rates ranging
+ from 106 kbit/s to 848 kbit/s. NFC communication always involves an initiator and a target.
+ The initiator actively generates an RF field that can power a passive target. This
+ enables NFC targets to take very simple form factors such as tags, stickers or cards that do
+ not require power. NFC peer-to-peer communication is also possible, where both devices
+ are powered.
+ <p>
+ Compared to other wireless technologies such as Bluetooth or WiFi, NFC provides much lower
+ bandwidth and range, but enables low-cost, un-powered targets
+ and does not require discovery or pairing. Interactions can be initiated with just a tap.
+ <p>
+ An Android device with NFC hardware will typically act as an initiator when the screen is
+ on. This mode is also known as NFC reader/writer. It will actively look for NFC tags and start
+ activities to handle them. Android 2.3.3 also has some limited P2P support.
+ <p>
+ Tags can range in complexity, simple tags just offer read/write semantics, sometimes
+ with one-time-programmable areas to make the card read-only. More complex tags offer
+ math operations, and have cryptographic hardware to authenticate access to a sector.
+ The most sophisticated tags contain operating environments, allowing
+ complex interactions with code executing on the tag.
<h2 id="api">API Overview</h2>
- <p>The {@link android.nfc} package contain the high-level classes to interact with the local
- device's NFC adapter, to represent discovered tags, and to use the NDEF data format.</p>
+ <p>The {@link android.nfc} package contains the high-level classes to interact
+ with the local device's NFC adapter, to represent discovered tags, and to use
+ the NDEF data format.
<table>
<tr>
@@ -65,44 +69,52 @@
<tr>
<td>{@link android.nfc.NfcManager}</td>
- <td>A high level manager class that enumerates the NFC adapters on this Android device. Since
- most Android devices only have one NFC adapter, you can just use the static helper {@link
- android.nfc.NfcAdapter#getDefaultAdapter()} for most situations.</td>
+
+ <td>A high level manager class that enumerates the NFC adapters on this Android device.
+ Since most Android devices only have one NFC adapter, you can just use the static helper
+ {@link android.nfc.NfcAdapter#getDefaultAdapter(Context)} for most situations.</td>
</tr>
<tr>
<td>{@link android.nfc.NfcAdapter}</td>
- <td>Represents the local NFC adapter and defines the Intents that are used in the tag
- dispatch system. It provides methods to register for foreground tag dispatching and
- foreground NDEF pushing. Foreground NDEF push is the only peer-to-peer support that is
- currently provided in Android.</td>
+ <td>Represents the local NFC adapter. Defines the intent's used to request
+ tag dispatch to your activity, and provides methods to register for foreground
+ tag dispatch and foreground NDEF push. Foreground NDEF push is the only
+ peer-to-peer support that is currently provided in Android.</td>
</tr>
<tr>
<td>{@link android.nfc.NdefMessage} and {@link android.nfc.NdefRecord}</td>
- <td>NDEF is an NFC Forum defined data structure, designed to efficiently store data on NFC
- tags, such as Text, URLs, and other MIME types. An {@link android.nfc.NdefMessage} acts as a
+ <td>NDEF is an NFC Forum defined data structure, designed to efficiently
+ store data on NFC tags, such as text, URL's, and other MIME types. A
+ {@link android.nfc.NdefMessage} acts as a
container for the data that you want to transmit or read. One {@link android.nfc.NdefMessage}
- object contains zero or more {@link android.nfc.NdefRecord}s. Each NDEF Record has a type
- such as Text, URL, Smart Poster, or any MIME type. The type of the first NDEF Record in the
- NDEF message is used to dispatch a tag to an Activity.</td>
+ object contains zero or more {@link android.nfc.NdefRecord}s. Each NDEF record
+ has a type such as text, URL, smart poster, or any MIME data. The type of the
+ first NDEF record in the NDEF message is used to dispatch a tag to an activity
+ on Android.</td>
</tr>
<tr>
<td>{@link android.nfc.Tag}</td>
- <td>Represents a passive NFC target. These can come in many form factors such as a tag, card,
- FOB, or an even more complex device doing card emulation. When a tag is discovered, a {@link
- android.nfc.Tag} object is created and wrapped inside an Intent. The dispatch system sends
- the Intent to a compatible Activity <code>startActivity()</code>. You can use the {@link
+ <td>Represents a passive NFC target. These can come in many form factors such as
+ a tag, card, key fob, or even a phone doing card emulation. When a tag is
+ discovered, a {@link android.nfc.Tag} object is created and wrapped inside an
+ Intent. The NFC dispatch system sends the intent to a compatible actvitiy
+ using <code>startActivity()</code>. You can use the {@link
android.nfc.Tag#getTechList getTechList()} method to determine the technologies supported by
this tag and create the corresponding {@link android.nfc.tech.TagTechnology} object with one
of classes provided by {@link android.nfc.tech}.</td>
</tr>
</table>
+ <p>The {@link android.nfc.tech} package contains classes to query properties
+ and perform I/O operations on a tag. The classes are divided to represent different
+ NFC technologies that can be available on a tag.
+
<p>The {@link android.nfc.tech} package contains classes to query properties and perform I/O
operations on a tag. The classes are divided to represent different NFC technologies that can be
available on a Tag:</p>
@@ -117,7 +129,7 @@
<tr>
<td>{@link android.nfc.tech.TagTechnology}</td>
- <td>The interface that all Tag Technology classes must implement.</td>
+ <td>The interface that all tag technology classes must implement.</td>
</tr>
<tr>
@@ -153,8 +165,8 @@
<tr>
<td>{@link android.nfc.tech.Ndef}</td>
- <td>Provides access to NDEF data and operations on NFC Tags that have been formatted as
- NDEF.</td>
+ <td>Provides access to NDEF data and operations on NFC tags that have been formatted as NDEF.
+ </td>
</tr>
<tr>
@@ -166,15 +178,15 @@
<tr>
<td>{@link android.nfc.tech.MifareClassic}</td>
- <td>Provides access to MIFARE Classic properties and I/O operations. Not all Android devices
- provide implementations for this class.</td>
+ <td>Provides access to MIFARE Classic properties and I/O operations, if this
+ Android device supports MIFARE.</td>
</tr>
<tr>
<td>{@link android.nfc.tech.MifareUltralight}</td>
- <td>Provides access to MIFARE Ultralight properties and I/O operations. Not all Android
- devices provide implementations for this class.</td>
+ <td>Provides access to MIFARE Ultralight properties and I/O operations, if this
+ Android device supports MIFARE.</td>
</tr>
</table>
@@ -191,12 +203,13 @@
</li>
<li>The minimum SDK version that your application can support. API level 9 only supports
- limited tag dispatching with {@link android.nfc.NfcAdapter#ACTION_TAG_DISCOVERED}, and only
- gives access to NDEF messages via the {@link android.nfc.NfcAdapter#EXTRA_NDEF_MESSAGES} extra.
- No other tag properties or I/O operations are accessible. API level 10 adds comprehensive
- reader/writer support, so you probably want to use this for more functionality.
- <pre class="pretty-print">
-<uses-sdk android:minSdkVersion="9|10"/>
+ limited tag dispatch via {@link android.nfc.NfcAdapter#ACTION_TAG_DISCOVERED},
+ and only gives access to NDEF messages via the {@link android.nfc.NfcAdapter#EXTRA_NDEF_MESSAGES}
+ extra. No other tag properties or I/O operations are accessible. You probably want
+ to use API level 10 which includes comprehensive reader/writer support.
+
+<pre class="pretty-print">
+<uses-sdk android:minSdkVersion="10"/>
</pre>
</li>
diff --git a/docs/html/sdk/android-3.0.jd b/docs/html/sdk/android-3.0.jd
index 6c88146..998c7c3 100644
--- a/docs/html/sdk/android-3.0.jd
+++ b/docs/html/sdk/android-3.0.jd
@@ -1,4 +1,4 @@
-page.title=Android 3.0 Platform Preview
+page.title=Android 3.0 Platform
sdk.platform.version=3.0
sdk.platform.apiLevel=11
@jd:body
@@ -25,7 +25,7 @@
<h2>See Also</h2>
<ol>
- <li><a href="{@docRoot}sdk/android-3.0-optimize.html">Optimizing Apps for Android 3.0</a></li>
+ <li><a href="{@docRoot}guide/practices/optimizing-for-3.0.html">Optimizing Apps for Android 3.0</a></li>
</ol>
</div>
@@ -48,10 +48,12 @@
href="{@docRoot}sdk/android-{@sdkPlatformVersion}-highlights.html">Platform
Highlights</a>.</p>
-<p>Also see the <a href="{@docRoot}sdk/android-3.0-optimize.html">Optimizing Apps for Android
-3.0</a> document for information about how to optimize your existing applications for Android 3.0
-devices, even if you want to remain compatible with previous versions.</p>
-
+<p class="note"><strong>Note:</strong>
+If you've already published an Android application, please test and optimize your application on
+Android 3.0 as soon as possible. You should do so to be sure your application provides the best
+experience possible on the latest Android-powered devices. For information about what you can do,
+read <a href="{@docRoot}guide/practices/optimizing-for-3.0.html">Optimizing Apps for Android
+3.0</a>.</p>
<h2 id="relnotes">Revisions</h2>
diff --git a/docs/html/sdk/ndk/index.jd b/docs/html/sdk/ndk/index.jd
index 40231a3..bc9ba4b 100644
--- a/docs/html/sdk/ndk/index.jd
+++ b/docs/html/sdk/ndk/index.jd
@@ -1,16 +1,16 @@
ndk=true
-ndk.win_download=android-ndk-r6-windows.zip
-ndk.win_bytes=64147764
-ndk.win_checksum=771b56328b7fc7751aa8040fb9dd09f0
+ndk.win_download=android-ndk-r5b-windows.zip
+ndk.win_bytes=61299831
+ndk.win_checksum=87745ada305ab639399161ab4faf684c
-ndk.mac_download=android-ndk-r6-darwin-x86.tar.bz2
-ndk.mac_bytes=50244722
-ndk.mac_checksum=d107f6d63478b73e09ed2eecd4c62bd3
+ndk.mac_download=android-ndk-r5b-darwin-x86.tar.bz2
+ndk.mac_bytes=50210863
+ndk.mac_checksum=019a14622a377b3727ec789af6707037
-ndk.linux_download=android-ndk-r6-linux-x86.tar.bz2
-ndk.linux_bytes=44088689
-ndk.linux_checksum=c83c3ab5a5e5a3b3fe7b907735ce77d4
+ndk.linux_download=android-ndk-r5b-linux-x86.tar.bz2
+ndk.linux_bytes=44138539
+ndk.linux_checksum=4c0045ddc2bfd657be9d5177d0e0b7e7
page.title=Android NDK
@jd:body
@@ -61,55 +61,6 @@
<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"
diff --git a/docs/html/sdk/sdk_toc.cs b/docs/html/sdk/sdk_toc.cs
index c1894d8..a1c26db 100644
--- a/docs/html/sdk/sdk_toc.cs
+++ b/docs/html/sdk/sdk_toc.cs
@@ -80,7 +80,6 @@
<div><a href="<?cs var:toroot ?>sdk/android-3.0.html">
<span class="en">Android 3.0 Platform</span></a> <span class="new">new!</span></div>
<ul>
- <li><a href="<?cs var:toroot ?>sdk/android-3.0-optimize.html">Optimizing Apps for 3.0</a></li>
<li><a href="<?cs var:toroot ?>sdk/android-3.0-highlights.html">Platform Highlights</a></li>
<li><a href="<?cs var:toroot ?>sdk/api_diff/11/changes.html">API Differences Report »</a></li>
</ul>
@@ -152,8 +151,8 @@
<span style="display:none" class="zh-TW"></span>
</h2>
<ul>
- <li><a href="<?cs var:toroot ?>sdk/ndk/index.html">Android NDK, r6</a>
- <span class="new">new!</span></li>
+ <li><a href="<?cs var:toroot ?>sdk/ndk/index.html">Android NDK, r5b</a>
+ </li>
<li><a href="<?cs var:toroot ?>sdk/ndk/overview.html">What is the NDK?</a></li>
</ul>
</li>