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

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

am 62c65665: am 81b68ad9: Merge "docs: show the download message on the SDK... 

am 62c65665: am 81b68ad9: Merge "docs: show the download message on the SDK homepage because we no longer need to walk through the TOS" into froyo

Merge commit '62c65665' into gingerbread-plus-aosp

* commit '62c65665':
  docs: show the download message on the SDK homepage because we no longer
parents b2fe30f0 62c65665

tools/droiddoc/templates-sdk/sdkpage.cs

+20 −3
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ computer. </p> 
    </a>

  </div>

?>



  <p>Welcome Developers! If you are new to the Android SDK, please read the <a

href="#quickstart">Quick Start</a>, below, for an overview of how to install and

set up the SDK. </p>
@@ -169,7 +170,8 @@ to get the components, rather than downloading a new SDK package.</p> 
  <tr>

    <td>Windows</td>

    <td>

  <a href="<?cs var:toroot ?>sdk/download.html?v=<?cs var:sdk.win_download ?>"><?cs var:sdk.win_download ?></a>

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

?>"><?cs var:sdk.win_download ?></a>

    </td>

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

    <td><?cs var:sdk.win_checksum ?></td>
@@ -177,7 +179,8 @@ to get the components, rather than downloading a new SDK package.</p> 
  <tr class="alt-color">

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

    <td>

  <a href="<?cs var:toroot ?>sdk/download.html?v=<?cs var:sdk.mac_download ?>"><?cs var:sdk.mac_download ?></a>

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

?>"><?cs var:sdk.mac_download ?></a>

    </td>

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

    <td><?cs var:sdk.mac_checksum ?></td>
@@ -185,7 +188,8 @@ to get the components, rather than downloading a new SDK package.</p> 
  <tr>

    <td>Linux (i386)</td>

    <td>

  <a href="<?cs var:toroot ?>sdk/download.html?v=<?cs var:sdk.linux_download ?>"><?cs var:sdk.linux_download ?></a>

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

?>"><?cs var:sdk.linux_download ?></a>

    </td>

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

    <td><?cs var:sdk.linux_checksum ?></td>
@@ -202,6 +206,19 @@ to get the components, rather than downloading a new SDK package.</p> 
  <?cs /if ?>

  </table>





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

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

</div>



<script type="text/javascript">

function onDownload(link) {

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

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

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

}

</script>



  <?cs /if ?>

 <?cs /if ?>

<?cs /if ?>

tools/droiddoc/templates/assets/android-developer-docs.css

+2 −2
Original line number Diff line number Diff line
@@ -813,8 +813,8 @@ p.img-caption { 
div.figure {

  float:right;

  clear:right;

  margin:1em 0 0 3em;

  padding:0;

  margin:1em 0 0 0;

  padding:0 0 0 3em;

  background-color:#fff;

  /* width must be defined w/ an inline style matching the image width */

}