diff options
| -rw-r--r-- | tools/droiddoc/templates-sdk/header_tabs.cs | 4 | ||||
| -rw-r--r-- | tools/droiddoc/templates-sdk/sdkpage.cs | 24 | ||||
| -rw-r--r-- | tools/droiddoc/templates/macros.cs | 9 |
3 files changed, 25 insertions, 12 deletions
diff --git a/tools/droiddoc/templates-sdk/header_tabs.cs b/tools/droiddoc/templates-sdk/header_tabs.cs index 356916b206..97d90489ac 100644 --- a/tools/droiddoc/templates-sdk/header_tabs.cs +++ b/tools/droiddoc/templates-sdk/header_tabs.cs @@ -20,9 +20,7 @@ <span style="display:none" class="zh-TW">首頁</span> <?cs /if ?> </a></li> - <li id="sdk-link"><a href="<?cs var:toroot ?><?cs - if:android.whichdoc != "online" ?>sdk/RELEASENOTES.html<?cs - else ?>sdk/<?cs var:sdk.current ?>/index.html<?cs /if ?>"> + <li id="sdk-link"><a href="<?cs var:toroot ?>sdk/index.html"> <span class="en">SDK</span> </a></li> <li id="guide-link"><a href="<?cs var:toroot ?>guide/index.html" onClick="return loadLast('guide')"> diff --git a/tools/droiddoc/templates-sdk/sdkpage.cs b/tools/droiddoc/templates-sdk/sdkpage.cs index 328eae139f..b7ecd94b78 100644 --- a/tools/droiddoc/templates-sdk/sdkpage.cs +++ b/tools/droiddoc/templates-sdk/sdkpage.cs @@ -33,28 +33,29 @@ <div class="g-unit" id="doc-content" > <div id="jd-header" class="guide-header" > <span class="crumb"> </span> - <h1><?cs if:android.whichdoc == "online" ?>Download <?cs /if ?><?cs var:page.title ?></h1> + <h1><?cs if:android.whichdoc == "online" ?>Download the <?cs /if ?><?cs var:page.title ?></h1> </div> <div id="jd-content"> - <p><em><?cs - if:ndk ?><?cs - var:ndk.date ?><?cs + <?cs + if:ndk ?><p><em><?cs + var:ndk.date ?></em></p><?cs else ?><?cs - var:sdk.date ?><?cs - /if ?></em> - </p> + if:android.whichdoc == "online" ?><p><em><?cs + var:sdk.date ?></em></p><?cs + /if ?><?cs + /if ?> <?cs if:sdk.not_latest_version ?> <div class="special"> <p><strong>This is NOT the current Android SDK release.</strong></p> - <p><a href="/sdk/<?cs var:sdk.current ?>/index.html">Download the current Android SDK</a></p> + <p><a href="/sdk/index.html">Download the current Android SDK</a></p> </div> <?cs /if ?> <?cs if:android.whichdoc != "online" && !android.preview ?> -<p>The sections below provide an overview of the SDK package. </p> +<!-- <p>The sections below provide an overview of how to install the SDK package. </p> --> <?cs else ?> <?cs if:ndk ?> @@ -118,6 +119,11 @@ var:sdk.preview.version ?> Platform Highlights</a> document for a list of highlights.</p> <?cs /if ?> +<p>To get started with the Android SDK, select a package from the table +below and download it to your development computer. Next, install the package +and then use the tools included to download one or more Android platforms, SDK +add-ons, or other components into your SDK. </p> + <p>Before downloading, please read the <a href="requirements.html"> System Requirements</a> document. As you start the download, you will also need to review and agree to the Terms and Conditions that govern the use of the diff --git a/tools/droiddoc/templates/macros.cs b/tools/droiddoc/templates/macros.cs index 8675b5b505..0c59f327bb 100644 --- a/tools/droiddoc/templates/macros.cs +++ b/tools/droiddoc/templates/macros.cs @@ -73,6 +73,15 @@ def:tag_list(tags) ?><?cs elif:tag.kind == "@sdkCurrent" ?><?cs var:sdk.current ?><?cs elif:tag.kind == "@sdkCurrentVersion" ?><?cs var:sdk.version ?><?cs elif:tag.kind == "@sdkCurrentRelId" ?><?cs var:sdk.rel.id ?><?cs + elif:tag.kind == "@sdkPlatformVersion" ?><?cs var:sdk.platform.version ?><?cs + elif:tag.kind == "@sdkPlatformApiLevel" ?><?cs var:sdk.platform.apiLevel ?><?cs + elif:tag.kind == "@sdkPlatformMajorMinor" ?><?cs var:sdk.platform.majorMinor ?><?cs + elif:tag.kind == "@sdkPlatformReleaseDate" ?><?cs var:sdk.platform.releaseDate ?><?cs + elif:tag.kind == "@sdkPlatformDeployableDate" ?><?cs var:sdk.platform.deployableDate ?><?cs + elif:tag.kind == "@adtZipVersion" ?><?cs var:adt.zip.version ?><?cs + elif:tag.kind == "@adtZipDownload" ?><?cs var:adt.zip.download ?><?cs + elif:tag.kind == "@adtZipBytes" ?><?cs var:adt.zip.bytes ?><?cs + elif:tag.kind == "@adtZipChecksum" ?><?cs var:adt.zip.checksum ?><?cs elif:tag.kind == "@inheritDoc" ?><?cs # This is the case when @inheritDoc is in something that doesn't inherit from anything?><?cs elif:tag.kind == "@attr" ?><?cs |