auto import from //branches/cupcake/...@130745
diff --git a/tools/droiddoc/templates-sdk/customization.cs b/tools/droiddoc/templates-sdk/customization.cs
index 6a0f64c..a116c67 100644
--- a/tools/droiddoc/templates-sdk/customization.cs
+++ b/tools/droiddoc/templates-sdk/customization.cs
@@ -5,14 +5,8 @@
<div id="header">
<div id="headerLeft">
<a href="<?cs var:toroot ?>index.html" tabindex="-1"><img
- src="<?cs var:toroot ?>assets/images/bg_logo.jpg" /></a>
- </div>
- <div id="headerRight">
- <div id="headerLinks" align="right">
- <img src="<?cs var:toroot ?>assets/images/icon_world.jpg"><span class="text"> <a href="#">English</a> | <a href="http://www.android.com">Android.com</a></span>
- </div>
+ src="<?cs var:toroot ?>assets/images/bg_logo.png" alt="Android Developers" /></a>
- <?cs call:default_search_box() ?>
<ul class="<?cs
if:reference ?>reference<?cs
elif:guide ?>guide<?cs
@@ -20,11 +14,13 @@
elif:home ?>home<?cs
elif:community ?>community<?cs
elif:publish ?>publish<?cs
- elif:about ?>about<?cs /if ?>">
- <?cs if:android.whichdoc == "online" ?>
- <li id="home-link"><a href="<?cs var:toroot ?>index.html"><span>Home</span></a></li>
- <?cs /if ?>
- <li id="sdk-link"><a href="<?cs var:toroot ?>sdk/index.html"><span>SDK</span></a></li>
+ elif:about ?>about<?cs /if ?>">
+ <li id="home-link"><a href="<?cs var:toroot ?><?cs
+ 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="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"
@@ -33,14 +29,26 @@
<li id="community-link"><a href="<?cs var:toroot ?>community/index.html"><span>Community</span></a></li>
</ul>
+ </div>
+ <div id="headerRight">
+ <div id="headerLinks">
+ <!-- <img src="<?cs var:toroot ?>assets/images/icon_world.jpg" alt="" /> -->
+ <span class="text">
+ <!-- <a href="#">English</a> | -->
+ <a href="http://www.android.com">Android.com</a>
+ </span>
+ </div>
+
+ <?cs call:default_search_box() ?>
+
</div><!-- headerRight -->
</div><!-- header -->
<?cs /def ?><?cs # custom_masthead ?>
<?cs def:sdk_nav() ?>
-<div class="g-section g-tpl-180" id="body-content">
- <div class="g-unit g-first" id="side-nav">
+<div class="g-section g-tpl-240" id="body-content">
+ <div class="g-unit g-first not-resizable" id="side-nav">
<div id="devdoc-nav">
<?cs include:"../../../java/android/html/sdk/sdk_toc.cs" ?>
</div>
@@ -82,9 +90,26 @@
<?cs /if ?>
<?cs /def ?>
-
<?cs # appears on the left side of the blue bar at the bottom of every page ?>
-<?cs def:custom_copyright() ?>Copyright 2008 <a href="http://source.android.com/">The Android Open Source Project</a><?cs /def ?>
+<?cs def:custom_cc_copyright() ?>Except as noted, this content is
+licensed under <a href="http://creativecommons.org/licenses/by/2.5/">
+Creative Commons Attribution 2.5</a>. For details and
+restrictions, see the <a href="<?cs var:toroot ?>license.html">Content
+License</a>.<?cs /def ?>
+
+<?cs def:custom_copyright() ?>Except as noted, this content is
+licensed under <a
+href="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</a>.
+For details and restrictions, see the <a href="<?cs var:toroot ?>license.html">
+Content License</a>.<?cs /def ?>
+
+<?cs def:custom_footerlinks() ?>
+<p>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+</p>
+<?cs /def ?>
<?cs # appears on the right side of the blue bar at the bottom of every page ?>
-<?cs def:custom_buildinfo() ?>Build <?cs var:page.build ?> - <?cs var:page.now ?><?cs /def ?>
+<?cs def:custom_buildinfo() ?>Android 1.1 r1 - <?cs var:page.now ?><?cs /def ?>
diff --git a/tools/droiddoc/templates-sdk/sdkpage.cs b/tools/droiddoc/templates-sdk/sdkpage.cs
index e274237..97fab66 100644
--- a/tools/droiddoc/templates-sdk/sdkpage.cs
+++ b/tools/droiddoc/templates-sdk/sdkpage.cs
@@ -1,88 +1,94 @@
+<?cs include:"doctype.cs" ?>
<?cs include:"macros.cs" ?>
<html>
-<?cs include:"head_tag.cs" ?>
+<?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">
+ <link href="<?cs var:toroot ?>assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+ </head>
+<?cs else ?>
+ <?cs include:"head_tag.cs" ?>
+<?cs /if ?>
<body class="gc-documentation">
<a name="top"></a>
<?cs call:custom_masthead() ?>
<?cs call:sdk_nav() ?>
-
+
<div class="g-unit" id="doc-content" >
-<div id="jd-content" style="min-width:870px">
+<div id="jd-content">
-<h1><?cs var:sdk.version ?></h1>
-<p><em>
-<?cs var:sdk.date ?> -
-<a href="RELEASENOTES.html">Release Notes</a>
-</em></p>
+<?cs if:sdk.redirect ?>
+ Redirecting to
+ <a href="<?cs var:toroot ?>sdk/<?cs var:sdk.redirect ?>/index.html">
+ <?cs var:toroot ?>sdk/<?cs var:sdk.redirect ?>/index.html
+ </a>...
+<?cs else ?>
+
+ <h1><?cs var:page.title ?></h1>
+ <p><em>
+ <?cs var:sdk.date ?>
+ </em></p>
-<div id="qv-wrapper">
-<div id="qv">
-<h2>Get Started</h2>
-<p><a href="requirements.html">System and Sofware Requirements</a></p>
-<p><a href="installing.html">Guide to Installing the SDK</a></p>
-
-<h2>Upgrade</h2>
-<p><a href="upgrading.html">Upgrading the SDK</a></p>
-<p><a href="migrating/changes-overview.html">API changes overview</a></p>
-<p><a href="migrating/changes.html">API differences report</a></p>
-
-<h2>Using Eclipse?</h2>
-<p>Android provides an Eclipse plugin to help make programming and debugging easier.</p>
-<p><a href="<?cs var:toroot ?>guide/developing/tools/adt.html">Install Eclipse plugin</a></p>
-</div>
-</div>
-
-
-<p>Before downloading, please read the <a href="terms.html">Terms</a>
- that govorn the use of the Android SDK.</p>
-
-<p class="special-note"><strong>Please note:</strong> The Android SDK is under active development.
- Please keep this in mind as you explore its capabilities. If you discover any issues, we
- welcome you to notify us of them via our Issue Tracker.</p>
-
-<table class="download">
+<?cs if:sdk.not_latest_version ?>
+ <div class="special">
+ <p><strong>This is NOT the latest version of the Android SDK</strong>.</p>
+ <p>Go to the <a href="<?cs var:toroot ?>sdk/index.html">SDK home page</a> to be directed to the latest version.</p>
+ </div>
+<?cs /if ?>
+
+
+<p>Before downloading, please read the <a href="<?cs var:toroot ?>sdk/<?cs var:sdk.version ?>/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>
+
+ <table class="download">
+ <tr>
+ <th>Platform</th>
+ <th>Package</th>
+ <th>Size</th>
+ <th>MD5 Checksum</th>
+ </tr>
<tr>
- <th>Platform</th>
- <th>Package</th>
- <th>Size</th>
- <th>MD5 Checksum</th>
-</tr>
-<tr>
- <td>Windows</td>
- <td>
-<a href="http://dl.google.com/android/<?cs var:sdk.win_download ?>"><?cs var:sdk.win_download ?></a>
- </td>
- <td><?cs var:sdk.win_bytes ?></td>
- <td><?cs var:sdk.win_checksum ?></td>
-</tr>
-<tr class="alt-color">
- <td>Mac OS X (intel)</td>
- <td>
-<a href="http://dl.google.com/android/<?cs var:sdk.mac_download ?>"><?cs var:sdk.mac_download ?></a>
- </td>
- <td><?cs var:sdk.mac_bytes ?></td>
- <td><?cs var:sdk.mac_checksum ?></td>
-</tr>
-<tr>
- <td>Linux (i386)</td>
- <td>
-<a href="http://dl.google.com/android/<?cs var:sdk.linux_download ?>"><?cs var:sdk.linux_download ?></a>
- </td>
- <td><?cs var:sdk.linux_bytes ?></td>
- <td><?cs var:sdk.linux_checksum ?></td>
-</tr>
-</table>
+ <td>Windows</td>
+ <td>
+ <a href="<?cs var:toroot ?>sdk/download.html?v=<?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>
+ </tr>
+ <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>
+ </td>
+ <td><?cs var:sdk.mac_bytes ?> bytes</td>
+ <td><?cs var:sdk.mac_checksum ?></td>
+ </tr>
+ <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>
+ </td>
+ <td><?cs var:sdk.linux_bytes ?> bytes</td>
+ <td><?cs var:sdk.linux_checksum ?></td>
+ </tr>
+ </table>
+
+ <?cs call:tag_list(root.descr) ?>
+<?cs /if ?>
</div><!-- end jd-content -->
<?cs include:"footer.cs" ?>
</div><!-- end doc-content -->
-</div><!-- end body-content -->
-<?cs include:"analytics.cs" ?>
+
+<?cs include:"trailer.cs" ?>
+
</body>
</html>