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
diff --git a/docs/html/sdk/android-1.6.jd b/docs/html/sdk/android-1.6.jd
index 5dd2d95..0f8a4b6 100644
--- a/docs/html/sdk/android-1.6.jd
+++ b/docs/html/sdk/android-1.6.jd
@@ -1,48 +1,75 @@
-page.title=Android 1.6 Version Notes
+page.title=Android 1.6, Release 1
+sdk.platform.version=1.6
+sdk.platform.apiLevel=4
+sdk.platform.majorMinor=minor
+sdk.platform.releaseDate=September 2009
+sdk.platform.deployableDate=October 2009
@jd:body
+<div id="qv-wrapper">
+<div id="qv">
+
+ <h2>In this document</h2>
+ <ol>
+ <li><a href="#features">Platform Highlights</a></li>
+ <li><a href="#apps">Built-in Applications</a></li>
+ <li><a href="#locs">Locales</a></li>
+ <li><a href="#skins">Emulator Skins</a></li>
+ <li><a href="#notes">Other Notes</a></li>
+ <li><a href="#api">Framework API</a>
+ <ol>
+ <li><a href="#api-level">API level</a></li>
+ <li><a href="#api-changes">API changes summary</a></li>
+ <li><a href="{@docRoot}sdk/api_diff/{@sdkPlatformApiLevel}/changes.html">API differences report »</a> </li>
+ </ol></li>
+ </ol>
+
+ <h2>See Also</h2>
+ <ol>
+ <li><a href="{@docRoot}sdk/adding-components.html">Adding SDK Components</a></li>
+ </ol>
+
+</div>
+</div>
+
<p>
-<em>Date:</em> September 2009<br />
-<em>API Level:</em> <strong>4</strong></p>
+<em>Date:</em> {@sdkPlatformReleaseDate}<br />
+<em>API Level:</em> <strong>{@sdkPlatformApiLevel}</strong></p>
+
+<p>Android {@sdkPlatformVersion} is a {@sdkPlatformMajorMinor} platform release
+deployable to Android-powered handsets starting in {@sdkPlatformDeployableDate}.
+The release includes new features for users and developers, as well as changes
+in the Android framework API. </p>
+
+<p>For developers, the Android {@sdkPlatformVersion} platform is available as a
+downloadable component for the Android SDK. The downloadable platform includes a
+fully compliant Android library and system image, as well as a set of emulator
+skins, sample applications, and more. The downloadable platform is fully
+compliant and includes no external libraries. </p>
+
+<p>To get started developing or testing against the Android
+{@sdkPlatformVersion} platform, use the Android SDK and AVD Manager tool to
+download the platform into your Android 1.6 or later SDK. For more information,
+see <a href="{@docRoot}sdk/adding-components.html">Adding SDK
+Components</a>.</p>
-<p>This document provides version notes for the Android 1.6 system image included in the SDK. </p>
-
-<ul>
-<li><a href="#overview">Overview</a>
-<li><a href="#features">Release Highlights</a>
-<li><a href="#apps">Built-in Applications</a>
-<li><a href="#locs">Locales</a>
-<li><a href="#api-changes">API Changes</a>
-</ul>
-
-<h2 id="overview">Overview</h2>
-
-<p>The Android 1.6 system delivered in the SDK (as library and system image) is
-the development counterpart to the Android 1.6 production system image, which is
-deployable to Android-powered handsets starting October 2009. The system is
-fully compliant and includes no external libraries. </p>
-
-<p>The Android 1.6 system delivers an updated version of the framework
-API. As with previous versions, the Android 1.6 API
-is assigned an integer identifier — <strong>4</strong> — that is
-stored in the system itself. This identifier, called the "API Level", allows the
-system to correctly determine whether an application is compatible with
-the system, prior to installing the application. </p>
-
-<p>For more information about how to use API Level, see the <a
-href="{@docRoot}guide/appendix/api-levels.html">API Levels</a> document. </p>
-
-<h2 id="features">Highlights</h2>
+<h2 id="features">Platform Highlights</h2>
<p>For a list of new user features and platform highlights, see the <a
-href="http://developer.android.com/sdk/android-1.6-highlights.html">Android 1.6 Platform
-Highlights</a> document.</p>
+href="http://developer.android.com/sdk/android-{@sdkPlatformVersion}-highlights.html">Android
+{@sdkPlatformVersion} Platform Highlights</a> document.</p>
+
<h2 id="apps">Built-in Applications</h2>
-<p>The system image includes these built-in applications:</p>
+<p>The system image included in the downloadable platform provides these
+built-in applications:</p>
+
+<table style="border:0;padding-bottom:0;margin-bottom:0;">
+<tr>
+<td style="border:0;padding-bottom:0;margin-bottom:0;">
<ul>
<li>Alarm Clock</li>
<li>Browser</li>
@@ -53,6 +80,10 @@
<li>Custom Locale (developer app)</li>
<li>Dev Tools (developer app)</li>
<li>Dialer</li>
+ </ul>
+</td>
+<td style="border:0;padding-bottom:0;margin-bottom:0;padding-left:5em;">
+ <ul>
<li>Email</li>
<li>Gallery</li>
<li>Gestures Builder</li>
@@ -62,79 +93,51 @@
<li>Settings</li>
<li>Spare Parts (developer app)</li>
</ul>
+</td>
+</tr>
+</table>
-<h2 id="locs">Locales</h2>
+<h2 id="locs" style="margin-top:.75em;">Locales</h2>
-<p>The system image provides a variety of built-in locales. In some cases,
-region-specific strings are available for the locales. In other cases,
-a default version of the language is used. The languages that will be
-available in the Android 1.6 system image are listed below (with
-<em>language</em>_<em>country/region</em> locale descriptor).</p>
+<p>The system image included in the downloadable platform provides a variety of
+built-in locales. In some cases, region-specific strings are available for the
+locales. In other cases, a default version of the language is used. The
+languages that will be available in the Android {@sdkPlatformVersion} system image are listed
+below (with <em>language</em>_<em>country/region</em> locale descriptor).</p>
-<table style="border:0;">
+<table style="border:0;margin-bottom:0;padding-bottom:0;">
<tr>
-<td style="border:0">
-<ul style="margin-bottom:0;">
-<li>Arabic, Egypt (ar_EG)</li>
-<li>Arabic, Israel (ar_IL)</li>
-<li>Bulgarian, Bulgaria (bg_BG)</li>
+<td style="border:0;padding-bottom:0;margin-bottom:0;">
+<ul>
<li>Chinese, PRC (zh_CN)</li>
<li>Chinese, Taiwan (zh_TW)</li>
-<li>Croatian, Croatia (hr_HR)</li>
-<li>Czech, Czech Republic (cs_CZ)</li>
-<li>Danish, Denmark (da_DK)</li>
+<li>Czech (cs_CZ)</li>
<li>Dutch, Netherlands (nl_NL)</li>
<li>Dutch, Belgium (nl_BE)</li>
<li>English, US (en_US)</li>
<li>English, Britain (en_GB)</li>
<li>English, Canada (en_CA)</li>
<li>English, Australia (en_AU)</li>
-<li>English, India (en_IN)</li>
-<li>English, Ireland (en_IE)</li>
<li>English, New Zealand (en_NZ)</li>
-<li>English, Singapore (en_SG)</li>
-<li>English, South Africa (en_ZA)</li>
-<li>Finnish, Finland (fi_FI)</li>
+<li>English, Singapore(en_SG)</li>
<li>French, France (fr_FR)</li>
<li>French, Belgium (fr_BE)</li>
+</ul>
+</td>
+<td style="border:0;padding-bottom:0;margin-bottom:0;padding-left:5em;">
<li>French, Canada (fr_CA)</li>
<li>French, Switzerland (fr_CH)</li>
<li>German, Germany (de_DE)</li>
<li>German, Austria (de_AT)</li>
<li>German, Switzerland (de_CH)</li>
<li>German, Liechtenstein (de_LI)</li>
-</ul>
-</td>
-<td style="border:0;padding-left:5em;">
-<ul style="margin-bottom:0;">
-<li>Greek, Greece (el_GR)</li>
-<li>Hindi, India (hi_IN)</li>
-<li>Hungarian, Hungary (hu_HU)</li>
-<li>Indonesian, Indonesia (id_ID)</li>
<li>Italian, Italy (it_IT)</li>
<li>Italian, Switzerland (it_CH)</li>
-<li>Japanese, Japan (ja_JP)</li>
-<li>Korean, Korea (ko_KR)</li>
-<li>Latvian, Latvia (lv_LV)</li>
-<li>Lithuanian, Lithuania (lt_LT)</li>
-<li>Norwegian Bokmål, Norway (nb_NO)</li>
-<li>Polish, Poland (pl_PL)</li>
-<li>Portuguese, Brazil (pt_BR)</li>
-<li>Portuguese, Portugal (pt_PT)</li>
-<li>Romanian, Romania (ro_RO)</li>
-<li>Russian, Russia (ru_RU)</li>
-<li>Serbian, Serbia (sr_RS)</li>
-<li>Slovak, Slovakia (sk_SK)</li>
-<li>Slovenian, Slovenia (sl_SI)</li>
-<li>Spanish, Spain (es_ES)</li>
-<li>Spanish, US (es_US)</li>
-<li>Swedish, Sweden (sv_SE)</li>
-<li>Thai, Thailand (th_TH)</li>
-<li>Tagalog, Philippines (tl_PH)</li>
-<li>Turkish, Turkey (tr_TR)</li>
-<li>Ukranian, Ukrania (uk_UA)</li>
-<li>Vietnamese, Vietnam (vi_VN)</li>
-</ul>
+<li>Japanese (ja_JP)</li>
+<li>Korean (ko_KR)</li>
+<li>Polish (pl_PL)</li>
+<li>Russian (ru_RU)</li>
+<li>Spanish (es_ES)</li>
</td>
</tr>
</table>
@@ -142,7 +145,50 @@
<p>Localized UI strings match the locales that are accessible
through Settings.</p>
-<h2 id="api-changes">API Changes</h2>
+<h2 id="api-changes">Emulator Skins</h2>
+
+<p>The downloadable platform includes a set of emulator skins that you can use for modeling your application in different screen sizes and resolutions. The emulator skins are: </p>
+
+<ul>
+ <li>
+ QVGA (240x320, low density, small screen)
+ </li>
+ <li>
+ HVGA (320x480, medium density, normal screen)
+ </li>
+ <li>
+ WVGA800 (480x800, high density, normal screen)
+ </li>
+ <li>
+ WVGA854 (480x854 high density, normal screen)
+ </li>
+</ul>
+
+<p>For more information about how to develop an application that displays and functions properly on all Android-powered devices, see <a href="{@docRoot}guide/practices/screens_support.html">Supporting Multiple Screens</a>.</p>
+
+
+<h2 id="api">Framework API</h2>
+
+<p>The sections below provide information about the application framework API provided by the Android {@sdkPlatformVersion} platform. </p>
+
+
+<h3 id="api-level">API level</h3>
+
+<p>The Android {@sdkPlatformVersion} platform delivers an updated version of the framework
+API. As with previous versions, the Android {@sdkPlatformVersion} API
+is assigned an integer identifier — <strong>{@sdkPlatformApiLevel}</strong> — that is
+stored in the system itself. This identifier, called the "API Level", allows the
+system to correctly determine whether an application is compatible with
+the system, prior to installing the application. </p>
+
+<p>To use APIs introduced in Android {@sdkPlatformVersion} in your application, you need to
+set the proper value, "{@sdkPlatformApiLevel}", in the <code><uses-sdk></code> attributes in your
+application's manifest. </p>
+
+<p>For more information about how to use API Level, see the <a
+href="{@docRoot}guide/appendix/api-levels.html">API Levels</a> document. </p>
+
+<h3 id="api-changes">API changes summary</h3>
<h4 id="UIFramework">UI framework</h4>
<ul>
@@ -318,7 +364,8 @@
</ul>
-<h3 id="api-diff">API Change Details</h3>
+<h3 id="api-diff">API differences report</h3>
-<p>For a detailed view of API changes in Android 1.6 (API Level 4), see the <a
-href="{@docRoot}sdk/api_diff/4/changes.html">API Differences Report</a>.</p>
+<p>For a detailed view of API changes in Android {@sdkPlatformVersion} (API Level {@sdkPlatformApiLevel}), as compared to
+the previous version, see the <a href="{@docRoot}sdk/api_diff/{@sdkPlatformApiLevel}/changes.html">API
+Differences Report</a>.</p>