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

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

am fa83b5e4: Merge "docs: update sdk download template DO NOT MERGE add... 

am fa83b5e4: Merge "docs: update sdk download template DO NOT MERGE add windows installer and revise a bit else" into gingerbread

* commit 'fa83b5e4':
  docs: update sdk download template DO NOT MERGE add windows installer and revise a bit else
parents 3a632f7d fa83b5e4

tools/droiddoc/templates-sdk/sdkpage.cs

+38 −28
Original line number Diff line number Diff line
@@ -156,9 +156,10 @@ computer. </p> 
href="#quickstart">Quick Start</a>, below, for an overview of how to install and

set up the SDK. </p>



  <p>If you are already using the Android SDK and would like to update to the

latest tools or platforms, please use the <em>Android SDK and AVD Manager</em>

to get the components, rather than downloading a new SDK package.</p>

  <p>If you're already using the Android SDK, you should

update to the latest tools or platform using the <em>Android SDK and AVD Manager</em>, rather than

downloading a new SDK starter package. See <a

href="{@docRoot}sdk/adding-components.html">Adding SDK Components</a>.</p>



  <table class="download">

    <tr>
@@ -168,7 +169,7 @@ to get the components, rather than downloading a new SDK package.</p> 
      <th>MD5 Checksum</th>

  </tr>

  <tr>

    <td>Windows</td>

    <td rowspan="2">Windows</td>

    <td>

  <a onclick="onDownload(this)" href="http://dl.google.com/android/<?cs var:sdk.win_download

?>"><?cs var:sdk.win_download ?></a>
@@ -176,6 +177,15 @@ to get the components, rather than downloading a new SDK package.</p> 
    <td><?cs var:sdk.win_bytes ?> bytes</td>

    <td><?cs var:sdk.win_checksum ?></td>

  </tr>

  <tr>

    <!-- blank TD from Windows rowspan -->

    <td>

  <a onclick="onDownload(this)" href="http://dl.google.com/android/<?cs var:sdk.win_installer

?>"><?cs var:sdk.win_installer ?></a> (Recommended)

    </td>

    <td><?cs var:sdk.win_installer_bytes ?> bytes</td>

    <td><?cs var:sdk.win_installer_checksum ?></td>

  </tr>

  <tr class="alt-color">

    <td>Mac OS X (intel)</td>

    <td>
@@ -208,12 +218,12 @@ to get the components, rather than downloading a new SDK package.</p> 




<div id="next-steps" style="display:none">

  <p><b>Your download of <em><span id="filename"></span></em> has begun!</b></p>

  <p><b><em><span id="filename"></span></em> is now downloading. Follow the steps below to

get started.</b></p>

</div>



<script type="text/javascript">

function onDownload(link) {

  $(link).parent().parent().children().css('background', '#fff');

  $("#filename").text($(link).html());

  $("#next-steps").show();

}