StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '81b68ad95d6a8ecb8a44ad453d336dff3a059488' into froyo-plus-aosp

* commit '81b68ad95d6a8ecb8a44ad453d336dff3a059488':
  docs: show the download message on the SDK homepage because we no longer
This commit is contained in:
Scott Main
2010-06-24 18:11:52 -07:00
committed by Android Git Automerger
parent 665828875b 81b68ad95d
commit fe75781ee9
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tools/droiddoc/templates-sdk/sdkpage.cs
View File

@@ -151,6 +151,7 @@ computer. </p>
</a> </a>
</div> </div>
?> ?>
<p>Welcome Developers! If you are new to the Android SDK, please read the <a <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 href="#quickstart">Quick Start</a>, below, for an overview of how to install and
set up the SDK. </p> set up the SDK. </p>
@@ -169,7 +170,8 @@ to get the components, rather than downloading a new SDK package.</p>
<tr> <tr>
<td>Windows</td> <td>Windows</td>
<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>
<td><?cs var:sdk.win_bytes ?> bytes</td> <td><?cs var:sdk.win_bytes ?> bytes</td>
<td><?cs var:sdk.win_checksum ?></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"> <tr class="alt-color">
<td>Mac OS X (intel)</td> <td>Mac OS X (intel)</td>
<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>
<td><?cs var:sdk.mac_bytes ?> bytes</td> <td><?cs var:sdk.mac_bytes ?> bytes</td>
<td><?cs var:sdk.mac_checksum ?></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> <tr>
<td>Linux (i386)</td> <td>Linux (i386)</td>
<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>
<td><?cs var:sdk.linux_bytes ?> bytes</td> <td><?cs var:sdk.linux_bytes ?> bytes</td>
<td><?cs var:sdk.linux_checksum ?></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 ?> <?cs /if ?>
</table> </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 ?> <?cs /if ?>
<?cs /if ?> <?cs /if ?>

4
tools/droiddoc/templates/assets/android-developer-docs.css
View File

@@ -813,8 +813,8 @@ p.img-caption {
div.figure { div.figure {
float:right; float:right;
clear:right; clear:right;
margin:1em 0 0 3em; margin:1em 0 0 0;
padding:0; padding:0 0 0 3em;
background-color:#fff; background-color:#fff;
/* width must be defined w/ an inline style matching the image width */ /* width must be defined w/ an inline style matching the image width */
} }