summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2012-01-18 12:33:45 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-01-18 12:33:45 -0800
commitdd41d360eac45ceae92963ed3f100f1c39dd5db2 (patch)
treeda2a7b4795ea1bca7a51b9d393c5c70992ed63fa /docs/html
parent3938e4fbaae132db9b4676ba26f6b3c042a6879e (diff)
parented2c2095e43f044b60547b20012aa4cf563731bb (diff)
downloadframeworks_base-dd41d360eac45ceae92963ed3f100f1c39dd5db2.zip
frameworks_base-dd41d360eac45ceae92963ed3f100f1c39dd5db2.tar.gz
frameworks_base-dd41d360eac45ceae92963ed3f100f1c39dd5db2.tar.bz2
Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
Diffstat (limited to 'docs/html')
-rw-r--r--docs/html/sdk/android-4.0.3.jd27
1 files changed, 22 insertions, 5 deletions
diff --git a/docs/html/sdk/android-4.0.3.jd b/docs/html/sdk/android-4.0.3.jd
index c17a422..1fca8df 100644
--- a/docs/html/sdk/android-4.0.3.jd
+++ b/docs/html/sdk/android-4.0.3.jd
@@ -58,12 +58,34 @@ revision number. To determine what revisions you have installed in your SDK
environment, refer to the "Installed Packages" listing in the Android SDK
Manager.</p>
+<p class="caution"><strong>Important:</strong> To download the new Android
+4.0.x system components from the Android SDK Manager, you must first update the
+SDK tools to revision 14 or later and restart the Android SDK Manager. If you do not,
+the Android 4.0.x system components will not be available for download.</p>
<div class="toggle-content opened" style="padding-left:1em;">
<p><a href="#" onclick="return toggleContent(this)">
<img src="{@docRoot}assets/images/triangle-opened.png"
class="toggle-content-img" alt="" />
+ Android {@sdkPlatformVersion}, Revision 2</a> <em>(January 2012)</em>
+ </a></p>
+
+ <div class="toggle-content-toggleme" style="padding-left:2em;">
+
+<dl>
+<dt>Maintenance release. SDK Tools r14 or higher is required.
+</dt>
+</dl>
+
+ </div>
+</div>
+
+<div class="toggle-content closed" style="padding-left:1em;">
+
+ <p><a href="#" onclick="return toggleContent(this)">
+ <img src="{@docRoot}assets/images/triangle-closed.png"
+class="toggle-content-img" alt="" />
Android {@sdkPlatformVersion}, Revision 1</a> <em>(December 2011)</em>
</a></p>
@@ -71,17 +93,12 @@ class="toggle-content-img" alt="" />
<dl>
<dt>Initial release. SDK Tools r14 or higher is required.
- <p class="caution"><strong>Important:</strong> To download the new Android
- 4.0.x system components from the Android SDK Manager, you must first update the
- SDK tools to revision 14 or later and restart the Android SDK Manager. If you do not,
- the Android 4.0.x system components will not be available for download.</p>
</dt>
</dl>
</div>
</div>
-
<h2 id="api">API Overview</h2>
<p>The sections below provide a technical overview of new APIs in Android 4.0.3.</p>