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

Merge change 20222 into donut

Browse Source 
* changes:
  Add support for preview SDK handling in doc templates.
This commit is contained in:
Android (Google) Code Review
2009-08-05 20:44:28 -07:00
parent 28ab3b12d3 82a28818f5
commit 89e555f3c5
3 changed files with 57 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/droiddoc/templates-sdk/header_tabs.cs
View File

@@ -58,8 +58,16 @@
<?cs /if ?>
</a></li>
<li id="videos-link"><a href="<?cs var:toroot ?>videos/index.html" onClick="return loadLast('videos')">
<?cs if:!sdk.redirect ?>
<span class="en">Videos</span>
<span class="ja">ビデオ</span>
<span class="de"></span>
<span class="es"></span>
<span class="fr"></span>
<span class="it"></span>
<span class="ja">ビデオ</span>
<span class="zh-CN"></span>
<span class="zh-TW"></span>
<?cs /if ?>
</a></li>
<li id="community-link"><a href="<?cs var:toroot ?>community/index.html">
<?cs if:!sdk.redirect ?>

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

@@ -6,7 +6,7 @@
<title>Redirecting...</title>
<meta http-equiv="refresh" content="0;url=<?cs var:toroot ?>sdk/<?cs
if:sdk.redirect.path ?><?cs var:sdk.redirect.path ?>"<?cs
else ?><?cs var:sdk.current ?>/index.html<?cs /if ?>"
else ?><?cs var:sdk.current ?>/index.html<?cs /if ?>">
<link href="<?cs var:toroot ?>assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
</head>
<?cs else ?>
@@ -24,8 +24,10 @@
<div id="jd-content">
<p>Redirecting to
<a href="<?cs var:toroot ?>sdk/<?cs
if:sdk.redirect.path ?><?cs var:sdk.redirect.path ?>">/sdk/<?cs var:sdk.redirect.path ?><?cs
else ?><?cs var:sdk.current ?>/index.html">/sdk/<?cs var:sdk.current ?>/index.html<?cs /if ?>
if:sdk.redirect.path ?><?cs var:sdk.redirect.path ?><?cs
else ?><?cs var:sdk.current ?>/index.html<?cs /if ?>">sdk/<?cs
if:sdk.redirect.path ?><?cs var:sdk.redirect.path ?><?cs
else ?><?cs var:sdk.current ?>/index.html<?cs /if ?>
</a> ...</p>
<?cs else ?>
<div class="g-unit" id="doc-content" >
@@ -50,7 +52,7 @@
</div>
<?cs /if ?>
<?cs if:android.whichdoc != "online" ?>
<?cs if:android.whichdoc != "online" && !android.preview ?>
<p>The sections below provide an overview of the SDK package. </p>
@@ -101,7 +103,20 @@ computer. </p>
</tr>
</table>
<?cs else ?>
<?cs else ?><?cs if:android.whichdoc == "online" ?>
<?cs if:sdk.preview ?>
<p>Welcome developers! The next release of the Android platform will be
Android 1.6 and we are pleased to announce the availability of an early look
SDK to give you a head-start on developing applications for it. </p>
<p>The Android 1.6 platform includes a variety of improvements and new
features for users and developers. Additionally, the SDK itself introduces
several new capabilities that enable you to develop applications more
efficiently. See the <a href="features.html">Android 1.6 Highlights</a>
document for a list of highlights.</p>
<?cs /if ?>
<p>Before downloading, please read the <a href="requirements.html">
System Requirements</a> document. As you start the download, you will also need to review and agree to
the Terms and Conditions that govern the use of the Android SDK. </p>
@@ -137,9 +152,32 @@ the Terms and Conditions that govern the use of the Android SDK. </p>
<td><?cs var:sdk.linux_bytes ?> bytes</td>
<td><?cs var:sdk.linux_checksum ?></td>
</tr>
<?cs if:adt.zip_download ?>
<tr class="alt-color">
<td>ADT Plugin for Eclipse <?cs var:adt.zip_version ?></td>
<td>
<a href="<?cs var:toroot ?>sdk/download.html?v=<?cs var:adt.zip_download ?>"><?cs var:adt.zip_download ?></a>
</td>
<td><?cs var:adt.zip_bytes ?> bytes</td>
<td><?cs var:adt.zip_checksum ?></td>
</tr>
<?cs /if ?>
</table>
<?cs /if ?>
<?cs /if ?>
<?cs /if ?>
<?cs /if ?>
<?cs if:android.whichdoc != "online" && sdk.preview ?>
<p>Welcome developers! The next release of the Android platform will be
Android 1.6 and we are pleased to announce the availability of an early look SDK
to give you a head-start on developing applications for it. </p>
<p>The Android 1.6 platform includes a variety of improvements and new features
for users and developers. Additionally, the SDK itself introduces several new
capabilities that enable you to develop applications more efficiently.
See the <a href="features.html">Android 1.6 Highlights</a> document for a list
of highlights.</p>
<?cs /if ?>
<?cs call:tag_list(root.descr) ?>

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

@@ -49,6 +49,8 @@ a:visited code {
input, select,
textarea, option {
font-family:inherit;
font-size:inherit;
padding:0;
margin:0;
}
@@ -177,6 +179,8 @@ hr.blue {
/* LAYOUT */
#body-content {
/* "Preliminary" watermark for preview releases and interim builds. */
background:transparent url(images/preliminary.png) repeat scroll 0 0;
margin:0;
position:relative;
width:100%;