doc change: Add docs for SDK. Support new modular structure. In Android.mk, change @since level identifier to 5.xml, expose adt downloadable vars. Fix links that pointed to @sdkCurrent.

Change-Id:I368345755dd753b1056fb06ff25e4b32f3020e4d
Bug:2160782

4 files changed, 31 insertions, 23 deletions

diff --git a/docs/html/guide/appendix/api-levels.jd b/docs/html/guide/appendix/api-levels.jd
index 3158192..3f3b6c6 100644
--- a/docs/html/guide/appendix/api-levels.jd
+++ b/docs/html/guide/appendix/api-levels.jd
@@ -83,6 +83,7 @@ Android platform.</p>
 
 <table>
   <tr><th>Platform Version</th><th>API Level</th></tr>
+  <tr><td>Android 2.0</td><td>5</td></tr>
   <tr><td>Android 1.6</td><td>4</td></tr>
   <tr><td>Android 1.5</td><td>3</td></tr>
   <tr><td>Android 1.1</td><td>2</td></tr>
@@ -115,6 +116,10 @@ they are designed to support. The element offers two key attributes:</p>
 <ul>
 <li><code>android:minSdkVersion</code> &mdash; Specifies the minimum API Level
 on which the application is able to run. The default value is "1".</li>
+<li><code>android:targetSdkVersion</code> &mdash; Specifies the API Level
+on which the application is designed to run. In some cases, this allows the
+application to use manifest elements or behaviors defined in the target
+API Level, rather than those in the minimum API Level.</li>
 <li><code>android:maxSdkVersion</code> &mdash; Specifies the maximum API Level
 on which the application is able to run.</li>
 </ul>
@@ -146,7 +151,7 @@ element might look like this: </p>
 
 <pre>&lt;manifest&gt;
   ...
-  &lt;uses-sdk android:minSdkVersion="4" /&gt;
+  &lt;uses-sdk android:minSdkVersion="5" /&gt;
   ...
 &lt;/manifest&gt;</pre>
 
@@ -288,23 +293,26 @@ a list of platform versions and their API Levels. </p>
 
 <h2 id="provisional">Using a Provisional API Level</h2>
 
-<p>During an "Early Look" SDK release, the APIs may not be final, so the API Level integer
-will not be specified. You must instead use a provisional API Level in your application
-manifest in order to build applications against the Early Look platform. In this case,
-the provisional API Level is not an integer, but a string matching the codename of the
-unreleased platform version (for example, "Eclair"). The provisional API Level will be specified
-in the Early Look SDK release notes and is case-sensitive.</p>
-
-<p>The use of a provisional API Level is designed to protect developers 
-and device users from inadvertently publishing or installing applications based on the 
-Early Look framework API, which may not run properly on actual devices running the final
-system image.</p>
-
-<p>The provisional API Level will only be valid while using the Early Look SDK to run
-applications in the emulator. An application using the provisional API Level can never be 
-installed on an Android device. When the final SDK is released, you must replace any
-instances of the provisional API Level in your application manifest with the final 
-API Level integer.</p>
+<p>In some cases, an "Early Look" Android SDK platform may be available. To let
+you begin developing on the platform although the APIs may not be final, the
+platform's API Level integer will not be specified. You must instead use the
+platform's <em>provisional API Level</em> in your application manifest, in order
+to build applications against the platform. A provisional API Level is not an
+integer, but a string matching the codename of the unreleased platform version.
+The provisional API Level will be specified in the release notes for the Early
+Look SDK release notes and is case-sensitive.</p>
+
+<p>The use of a provisional API Level is designed to protect developers and
+device users from inadvertently publishing or installing applications based on
+the Early Look framework API, which may not run properly on actual devices
+running the final system image.</p>
+
+<p>The provisional API Level will only be valid while using the Early Look SDK
+and can only be used to run applications in the emulator. An application using
+the provisional API Level can never be installed on an Android device. At the
+final release of the platform, you must replace any instances of the provisional
+API Level in your application manifest with the final platform's actual API
+Level integer.</p>
 
 
 <h2 id="filtering">Filtering the Reference Documentation by API Level</h2>
diff --git a/docs/html/guide/developing/eclipse-adt.jd b/docs/html/guide/developing/eclipse-adt.jd
index c3ec2e5..667aa9f 100644
--- a/docs/html/guide/developing/eclipse-adt.jd
+++ b/docs/html/guide/developing/eclipse-adt.jd
@@ -38,12 +38,12 @@ manifest and resource files.</li>
 
 <p>To begin developing Android applications in the Eclipse IDE with ADT, you first need to 
 download the Eclipse IDE and then download and install the ADT plugin. To do so, follow the 
-steps given in <a href="{@docRoot}sdk/{@sdkCurrent}/installing.html#installingplugin">Installing 
+steps given in <a href="{@docRoot}sdk/eclipse-adt.html#installing">Installing 
 the ADT Plugin</a>.</p>
 
 <p>If you are already developing applications using a version of ADT earlier than 0.9, make
 sure to upgrade to the latest version before continuing. See the guide to
-<a href="{@docRoot}sdk/{@sdkCurrent}/upgrading.html#UpdateAdt">Updating Your Eclipse ADT Plugin</a>.</p>
+<a href="{@docRoot}sdk/eclipse-adt.html#updating">Updating Your ADT Plugin</a>.</p>
 
 <p class="note"><strong>Note:</strong> This guide assumes you are using the latest version of
 the ADT plugin. While most of the information covered also applies to previous 
diff --git a/docs/html/guide/developing/tools/othertools.jd b/docs/html/guide/developing/tools/othertools.jd
index b4c4cf3..00f0b8d 100644
--- a/docs/html/guide/developing/tools/othertools.jd
+++ b/docs/html/guide/developing/tools/othertools.jd
@@ -26,14 +26,14 @@ Android applications. </p>
   <li>Create and update Android projects. See
   <a href="{@docRoot}guide/developing/other-ide.html">Developing in Other IDEs</a>.</li>
   <li>Update your Android SDK with new platforms, add-ons, and documentation. See
-  <a href="{@docRoot}guide/developing/updating-sdk.html">Updating Your SDK</a>.</li>
+  <a href="{@docRoot}sdk/adding-components.html">Adding SDK Components</a>.</li>
 </ul>
 
 <p>If you develop in Eclipse with the ADT plugin, you can perform
 these tasks directly from the IDE. To create
 Android projects and AVDs from Eclipse, see <a href="{@docRoot}guide/developing/eclipse-adt.html">Developing
 In Eclipse</a>. To update your SDK from Eclipse, see
-<a href="{@docRoot}guide/developing/updating-sdk.html">Updating Your SDK</a>. 
+<a href="{@docRoot}sdk/adding-components.html">Adding SDK Components</a>. 
 </p>
 
 
diff --git a/docs/html/guide/tutorials/hello-world.jd b/docs/html/guide/tutorials/hello-world.jd
index 79b723d..58d1a16 100644
--- a/docs/html/guide/tutorials/hello-world.jd
+++ b/docs/html/guide/tutorials/hello-world.jd
@@ -29,7 +29,7 @@ You can then return to this tutorial and ignore anything about Eclipse.</p>
 
 <p>Before you start, you should already have the very latest SDK installed, and if you're using
 Eclipse, you should have installed the ADT plugin as well. If you have not installed these, see 
-<a href="{@docRoot}sdk/{@sdkCurrent}/installing.html">Installing the Android SDK</a> and return
+<a href="{@docRoot}sdk/installing.html">Installing the Android SDK</a> and return
 here when you've completed the installation.</p>
 
 <h2 id="avd">Create an AVD</h2>