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

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

Browse Source
This commit is contained in:
Scott Main
2010-11-01 10:49:07 -07:00
committed by Android (Google) Code Review
parent 6a514dcc9d f086a6e434
commit fa83b5e4da
1 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,8 +4,8 @@
<?cs if:sdk.redirect ?> <?cs if:sdk.redirect ?>
<head> <head>
<title>Redirecting...</title> <title>Redirecting...</title>
<meta http-equiv="refresh" content="0;url=<?cs var:toroot ?>sdk/<?cs <meta http-equiv="refresh" content="0;url=<?cs var:toroot ?>sdk/<?cs
if:sdk.redirect.path ?><?cs var:sdk.redirect.path ?><?cs if:sdk.redirect.path ?><?cs var:sdk.redirect.path ?><?cs
else ?>index.html<?cs /if ?>"> else ?>index.html<?cs /if ?>">
<link href="<?cs var:toroot ?>assets/android-developer-docs.css" rel="stylesheet" type="text/css" /> <link href="<?cs var:toroot ?>assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
</head> </head>
@@ -22,8 +22,8 @@
<div class="g-unit"> <div class="g-unit">
<div id="jd-content"> <div id="jd-content">
<p>Redirecting to <p>Redirecting to
<a href="<?cs var:toroot ?>sdk/<?cs <a href="<?cs var:toroot ?>sdk/<?cs
if:sdk.redirect.path ?><?cs var:sdk.redirect.path ?><?cs if:sdk.redirect.path ?><?cs var:sdk.redirect.path ?><?cs
else ?>index.html<?cs /if ?>"><?cs else ?>index.html<?cs /if ?>"><?cs
if:sdk.redirect.path ?><?cs var:sdk.redirect.path ?><?cs if:sdk.redirect.path ?><?cs var:sdk.redirect.path ?><?cs
@@ -37,11 +37,11 @@
</div> </div>
<div id="jd-content"> <div id="jd-content">
<?cs <?cs
if:ndk ?><?cs if:ndk ?><?cs
else ?><?cs else ?><?cs
if:android.whichdoc == "online" ?><p><em><?cs if:android.whichdoc == "online" ?><p><em><?cs
var:sdk.date ?></em></p><?cs var:sdk.date ?></em></p><?cs
/if ?><?cs /if ?><?cs
/if ?> /if ?>
@@ -63,7 +63,7 @@
application developers build performance-critical portions of their apps in application developers build performance-critical portions of their apps in
native code. It is designed for use <em>only</em> in conjunction with the native code. It is designed for use <em>only</em> in conjunction with the
Android SDK, so if you have not already installed the latest Android SDK, please Android SDK, so if you have not already installed the latest Android SDK, please
do so before downloading the NDK. Also, please read <a href="#overview">What is do so before downloading the NDK. Also, please read <a href="#overview">What is
the Android NDK?</a> to get an understanding of what the NDK offers and whether the Android NDK?</a> to get an understanding of what the NDK offers and whether
it will be useful to you.</p> it will be useful to you.</p>
@@ -114,16 +114,16 @@ computer. </p>
improvements and new features for users and developers. Additionally, the SDK improvements and new features for users and developers. Additionally, the SDK
itself introduces several new capabilities that enable you to develop itself introduces several new capabilities that enable you to develop
applications more efficiently. See the <a href="features.html">Android <?cs applications more efficiently. See the <a href="features.html">Android <?cs
var:sdk.preview.version ?> Platform Highlights</a> document for a list of var:sdk.preview.version ?> Platform Highlights</a> document for a list of
highlights.</p> highlights.</p>
<?cs /if ?> <?cs /if ?>
<?cs # end if NDK ... the following is for the SDK ?> <?cs # end if NDK ... the following is for the SDK ?>
<?cs # <?cs #
<div class="toggle-content special"> <div class="toggle-content special">
<p>The Android SDK has changed! If you've worked with the Android SDK before, <p>The Android SDK has changed! If you've worked with the Android SDK before,
you will notice several important differences:</p> you will notice several important differences:</p>
<div class="toggle-content-toggleme" style="display:none"> <div class="toggle-content-toggleme" style="display:none">
<ul style="padding-bottom:.0;"> <ul style="padding-bottom:.0;">
<li style="margin-top:.5em">The SDK downloadable package includes <em>only</em> <li style="margin-top:.5em">The SDK downloadable package includes <em>only</em>
@@ -139,13 +139,13 @@ computer. </p>
keep your development environment up-to-date. </li> keep your development environment up-to-date. </li>
</ul> </ul>
<p style="margin-top:0">If you are currently using the Android 1.6 SDK, you <p style="margin-top:0">If you are currently using the Android 1.6 SDK, you
do not need to install the new SDK, because your existing SDK already do not need to install the new SDK, because your existing SDK already
includes the Android SDK and AVD Manager tool. To develop against Android includes the Android SDK and AVD Manager tool. To develop against Android
2.0.1, for example, you can just download the Android 2.0.1 platform (and 2.0.1, for example, you can just download the Android 2.0.1 platform (and
updated SDK Tools) into your existing SDK. Refer to <a updated SDK Tools) into your existing SDK. Refer to <a
href="adding-components.html">Adding SDK Components</a>.</p> href="adding-components.html">Adding SDK Components</a>.</p>
</div> </div>
<a href='#' class='toggle-content-button show' onclick="toggleContent(this,true);return false;"> <a href='#' class='toggle-content-button show' onclick="toggleContent(this,true);return false;">
<span>show more</span><span style='display:none'>show less</span> <span>show more</span><span style='display:none'>show less</span>
</a> </a>
@@ -156,9 +156,10 @@ computer. </p>
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>
<p>If you are already using the Android SDK and would like to update to the <p>If you're already using the Android SDK, you should
latest tools or platforms, please use the <em>Android SDK and AVD Manager</em> update to the latest tools or platform using the <em>Android SDK and AVD Manager</em>, rather than
to get the components, rather than downloading a new SDK package.</p> downloading a new SDK starter package. See <a
href="{@docRoot}sdk/adding-components.html">Adding SDK Components</a>.</p>
<table class="download"> <table class="download">
<tr> <tr>
@@ -168,7 +169,7 @@ to get the components, rather than downloading a new SDK package.</p>
<th>MD5 Checksum</th> <th>MD5 Checksum</th>
</tr> </tr>
<tr> <tr>
<td>Windows</td> <td rowspan="2">Windows</td>
<td> <td>
<a onclick="onDownload(this)" href="http://dl.google.com/android/<?cs var:sdk.win_download <a onclick="onDownload(this)" href="http://dl.google.com/android/<?cs var:sdk.win_download
?>"><?cs var:sdk.win_download ?></a> ?>"><?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_bytes ?> bytes</td>
<td><?cs var:sdk.win_checksum ?></td> <td><?cs var:sdk.win_checksum ?></td>
</tr> </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"> <tr class="alt-color">
<td>Mac OS X (intel)</td> <td>Mac OS X (intel)</td>
<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"> <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> </div>
<script type="text/javascript"> <script type="text/javascript">
function onDownload(link) { function onDownload(link) {
$(link).parent().parent().children().css('background', '#fff');
$("#filename").text($(link).html()); $("#filename").text($(link).html());
$("#next-steps").show(); $("#next-steps").show();
} }
@@ -221,7 +231,7 @@ function onDownload(link) {
<?cs /if ?> <?cs /if ?>
<?cs /if ?> <?cs /if ?>
<?cs /if ?> <?cs /if ?>
<?cs if:android.whichdoc != "online" && sdk.preview ?> <?cs if:android.whichdoc != "online" && sdk.preview ?>
<p>Welcome developers! The next release of the Android platform will be <p>Welcome developers! The next release of the Android platform will be
@@ -233,7 +243,7 @@ applications for it. </p>
improvements and new features for users and developers. Additionally, the SDK improvements and new features for users and developers. Additionally, the SDK
itself introduces several new capabilities that enable you to develop itself introduces several new capabilities that enable you to develop
applications more efficiently. See the <a applications more efficiently. See the <a
href="http://developer.android.com/sdk/preview/features.html">Android href="http://developer.android.com/sdk/preview/features.html">Android
<?cs var:sdk.preview.version ?> Highlights</a> document for a list of <?cs var:sdk.preview.version ?> Highlights</a> document for a list of
highlights.</p> highlights.</p>
<?cs /if ?> <?cs /if ?>