p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'readonly-p4-master'

This commit is contained in:
Dirk Dougherty 2009-04-20 17:58:00 -07:00 committed by The Android Open Source Project
parent 7280e2d2e3 911e311e4e
commit e7b6e882e5
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/droiddoc/src/Comment.java
View File

@ -47,6 +47,7 @@ public class Comment
"@deprecated",
"@undeprecate",
"@docRoot",
"@sdkCurrent",
"@inheritDoc",
"@more",
"@code",

8
tools/droiddoc/templates-sdk/customization.cs
View File

@ -19,7 +19,7 @@ def:custom_masthead() ?>
if:android.whichdoc != "online" ?>offline.html<?cs
else ?>index.html<?cs /if ?>">
<span>Home</span></a></li>
<li id="sdk-link"><a href="<?cs var:toroot ?>sdk/1.1_r1/index.html"><span>SDK</span></a></li>
<li id="sdk-link"><a href="<?cs var:toroot ?>sdk/<?cs var:sdk.current ?>/index.html"><span>SDK</span></a></li>
<li id="guide-link"><a href="<?cs var:toroot ?>guide/index.html"
onClick="return loadLast('guide')"><span>Dev Guide</span></a></li>
<li id="reference-link"><a href="<?cs var:toroot ?>reference/packages.html"
@ -115,7 +115,7 @@ def:custom_footerlinks() ?>
</p><?cs
/def ?>
<?cs # appears on the right side of the blue bar at the bottom of every page ?><?cs
<?cs # appears on the right side of the blue bar at the bottom off every page ?><?cs
def:custom_buildinfo() ?>
Android 1.1 r1 - <?cs var:page.now ?><?cs
/def ?>
Android <?cs var:sdk.version ?>&nbsp;r<?cs var:sdk.rel.id ?> - <?cs var:page.now ?>
<?cs /def ?>

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

@ -4,7 +4,7 @@
<?cs if:sdk.redirect ?>
<head>
<title>Redirecting...</title>
<meta http-equiv="refresh" content="0;url=<?cs var:toroot ?>sdk/<?cs var:sdk.redirect ?>/index.html">
<meta http-equiv="refresh" content="0;url=<?cs var:toroot ?>sdk/<?cs var:sdk.current ?>/index.html">
<link href="<?cs var:toroot ?>assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
</head>
<?cs else ?>
@ -21,14 +21,14 @@
<?cs if:sdk.redirect ?>
Redirecting to
<a href="<?cs var:toroot ?>sdk/<?cs var:sdk.redirect ?>/index.html">
<a href="<?cs var:toroot ?>sdk/<?cs var:sdk.current ?>/index.html">
<?cs var:toroot ?>sdk/<?cs var:sdk.redirect ?>/index.html
</a>...
<?cs else ?>
<div id="jd-header" class="guide-header" >
<span class="crumb">&nbsp;</span>
<h1><?cs if:android.whichdoc == "online" ?>Download <?cs /if ?><?cs var:page.title ?></h1>
<h1><?cs if:android.whichdoc == "online" ?>Download <?cs /if ?><?cs var:sdk.self ?></h1>
</div>
@ -52,7 +52,7 @@
<?cs else ?>
<p>Before downloading, please read the <a href="<?cs var:toroot ?>sdk/<?cs var:sdk.version ?>/requirements.html">
<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>

3
tools/droiddoc/templates/macros.cs
View File

@ -61,6 +61,9 @@ def:tag_list(tags) ?><?cs
elif:tag.name == "@sample" ?><pre class="Code prettyprint"><?cs var:tag.text ?></pre><?cs
elif:tag.name == "@include" ?><?cs var:tag.text ?><?cs
elif:tag.kind == "@docRoot" ?><?cs var:toroot ?><?cs
elif:tag.kind == "@sdkCurrent" ?><?cs var:sdk.current ?><?cs
elif:tag.kind == "@sdkCurrentVersion" ?><?cs var:sdk.version ?><?cs
elif:tag.kind == "@sdkCurrentRelId" ?><?cs var:sdk.rel.id ?><?cs
elif:tag.kind == "@inheritDoc" ?><?cs # This is the case when @inheritDoc is in something
that doesn't inherit from anything?><?cs
elif:tag.kind == "@attr" ?><?cs