diff options
author | Scott Main <smain@google.com> | 2009-08-06 01:56:25 -0700 |
---|---|---|
committer | Scott Main <smain@google.com> | 2009-08-06 01:56:25 -0700 |
commit | 02a803f201df2c267ab3a10cf6547c69d72ba6db (patch) | |
tree | bea3ffc8a21fdffde9222c3db12d80aef518457f /docs/html/sdk | |
parent | f11d7d559a6cd866bbffaead39da9f6a84919ecc (diff) | |
download | frameworks_base-02a803f201df2c267ab3a10cf6547c69d72ba6db.zip frameworks_base-02a803f201df2c267ab3a10cf6547c69d72ba6db.tar.gz frameworks_base-02a803f201df2c267ab3a10cf6547c69d72ba6db.tar.bz2 |
final changes to make the sdk sidenav work for the offline preview docs
Diffstat (limited to 'docs/html/sdk')
-rw-r--r-- | docs/html/sdk/preview/index.jd | 3 | ||||
-rw-r--r-- | docs/html/sdk/preview/installing.jd | 10 | ||||
-rw-r--r-- | docs/html/sdk/preview/requirements.jd | 2 | ||||
-rw-r--r-- | docs/html/sdk/preview/upgrading.jd | 9 | ||||
-rw-r--r-- | docs/html/sdk/sdk_toc.cs | 20 |
5 files changed, 27 insertions, 17 deletions
diff --git a/docs/html/sdk/preview/index.jd b/docs/html/sdk/preview/index.jd index 306c3cb..e550d61 100644 --- a/docs/html/sdk/preview/index.jd +++ b/docs/html/sdk/preview/index.jd @@ -1,6 +1,7 @@ +page.title=Android 1.6 Early Look SDK sdk.redirect=0 +sdk.version=1.6 sdk.preview=true -page.title=Android 1.6 Early Look SDK sdk.date=August 2009 diff --git a/docs/html/sdk/preview/installing.jd b/docs/html/sdk/preview/installing.jd index 29c70f6..e6718fc 100644 --- a/docs/html/sdk/preview/installing.jd +++ b/docs/html/sdk/preview/installing.jd @@ -1,5 +1,6 @@ page.title=Installing the Android SDK -sdk.version=1.6 Early Look +sdk.version=1.6 +sdk.preview=true sdk.date=August 2009 @jd:body @@ -21,13 +22,6 @@ sdk.date=August 2009 <li><a href="#InstallationNotes">Installation Notes</a></li> </ol> -<!-- - <h2>Migrating references</h2> - <ol> - <li><a href="{@docRoot}sdk/api_diff/donut/changes.html">Android 1.6 Early Look API Differences</a></li> - </ol> - --> - </div> </div> diff --git a/docs/html/sdk/preview/requirements.jd b/docs/html/sdk/preview/requirements.jd index 612d23d..15731e0 100644 --- a/docs/html/sdk/preview/requirements.jd +++ b/docs/html/sdk/preview/requirements.jd @@ -1,4 +1,6 @@ page.title=System Requirements +sdk.version=1.6 +sdk.preview=true @jd:body <p>The sections below describe the system and software requirements for developing diff --git a/docs/html/sdk/preview/upgrading.jd b/docs/html/sdk/preview/upgrading.jd index 99159fb..989147c 100644 --- a/docs/html/sdk/preview/upgrading.jd +++ b/docs/html/sdk/preview/upgrading.jd @@ -1,5 +1,6 @@ page.title=Upgrading the SDK -sdk.version=1.6 Early Look +sdk.version=1.6 +sdk.preview=true @jd:body @@ -8,10 +9,10 @@ sdk.version=1.6 Early Look <h2>Upgrading the SDK</h2> <ul> - <li>To move existing projects into the SDK, you must make some minor changes in your - development environment.</li> - <li>ADT 0.9[.1] is not compatible with the Android 1.6 Early Look SDK. You must upgrade + <li>ADT 0.9 / 0.9.1 is not compatible with the Android 1.6 Early Look SDK. You must upgrade ADT to 0.9.2.</li> + <li>The Early Look SDK uses a special provisional API Level, "Donut", which is required + to compile against the new Donut platform.</li> </ul> <h2>In this document</h2> diff --git a/docs/html/sdk/sdk_toc.cs b/docs/html/sdk/sdk_toc.cs index d599825..c08d75e 100644 --- a/docs/html/sdk/sdk_toc.cs +++ b/docs/html/sdk/sdk_toc.cs @@ -19,7 +19,10 @@ /if ?> <ul><?cs if:android.whichdoc == "online" ?> - <li><a href="index.html"> + <li><a href="<?cs var:toroot ?>sdk/<?cs + if:sdk.preview ?>preview<?cs + else ?><?cs var:sdk.current ?><?cs + /if ?>/index.html"> <span class="en">Download</span> <span class="de">Herunterladen</span> <span class="es">Descargar</span> @@ -30,7 +33,10 @@ <span class="zh-TW">下載</span> </a></li><?cs /if ?> - <li><a href="installing.html"> + <li><a href="<?cs var:toroot ?>sdk/<?cs + if:sdk.preview ?>preview<?cs + else ?><?cs var:sdk.current ?><?cs + /if ?>/installing.html"> <span class="en">Installing</span> <span class="de">Installieren</span> <span class="es">Instalación</span> @@ -40,8 +46,14 @@ <span class="zh-CN">安装</span> <span class="zh-TW">安裝</span> </a></li> - <li><a href="upgrading.html">Upgrading</a></li> - <li><a href="requirements.html">System Requirements</a></li> + <li><a href="<?cs var:toroot ?>sdk/<?cs + if:sdk.preview ?>preview<?cs + else ?><?cs var:sdk.current ?><?cs + /if ?>/upgrading.html">Upgrading</a></li> + <li><a href="<?cs var:toroot ?>sdk/<?cs + if:sdk.preview ?>preview<?cs + else ?><?cs var:sdk.current ?><?cs + /if ?>/requirements.html">System Requirements</a></li> </ul> <ul> <li><a href="<?cs var:toroot ?>sdk/terms.html">SDK Terms and Conditions</a></li> |