Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f320f46 authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am 02a803f2: final changes to make the sdk sidenav work for the offline preview docs 

Merge commit '02a803f2'

* commit '02a803f2':
  final changes to make the sdk sidenav work for the offline preview docs
parents 5e72709d 02a803f2

docs/html/sdk/preview/index.jd

+2 −1
Original line number Diff line number Diff line 
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

docs/html/sdk/preview/installing.jd

+2 −8
Original line number Diff line number Diff line 
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>

docs/html/sdk/preview/requirements.jd

+2 −0
Original line number Diff line number Diff line 
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

docs/html/sdk/preview/upgrading.jd

+5 −4
Original line number Diff line number Diff line 
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>

docs/html/sdk/sdk_toc.cs

+16 −4
Original line number Diff line number Diff line
@@ -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>