am 4dc826b7: am 389cdb7a: Merge change 26258 into eclair

Merge commit '4dc826b75c0543a9b7539f3e341fd6552f9f95f7'

* commit '4dc826b75c0543a9b7539f3e341fd6552f9f95f7':
  docs only.
This commit is contained in:
Scott Main 2009-09-25 11:10:25 -07:00 committed by Android Git Automerger
commit 1e7ee1a568
2 changed files with 51 additions and 113 deletions

View File

@ -1,66 +0,0 @@
<ul>
<li><div><a href="<?cs var:toroot ?>index.html">Home</a></div></li>
<li><div><a href="<?cs var:toroot ?>what-is-android.html">What is Android?</a></div></li>
<li><div><a href="<?cs var:toroot ?>intro/index.html">Getting Started</a></div>
<ul>
<li><div><a href="<?cs var:toroot ?>intro/installing.html">Installing the SDK</a></div></li>
<li><div><a href="<?cs var:toroot ?>intro/upgrading.html">Upgrading the SDK</a></div></li>
<li><div><a href="<?cs var:toroot ?>intro/develop-and-debug.html">Developing/Debugging</a></div></li>
<li><div><a href="<?cs var:toroot ?>intro/hello-android.html">Hello Android</a></div></li>
<li><div><a href="<?cs var:toroot ?>intro/anatomy.html">Anatomy of an App</a></div></li>
<li><div><a href="<?cs var:toroot ?>intro/tutorial.html">Notepad Tutorial</a></div></li>
<li><div><a href="<?cs var:toroot ?>intro/tools.html">Development Tools</a></div></li>
<li><div><a href="<?cs var:toroot ?>intro/appmodel.html">Application Model</a></div></li>
<li><div><a href="<?cs var:toroot ?>intro/lifecycle.html">Application Life Cycle</a></div></li>
</ul>
</li>
<li><div><div><a href="<?cs var:toroot ?>devel/index.html">Developing Applications</a></div>
<ul>
<li><div><a href="<?cs var:toroot ?>devel/implementing-ui.html">Implementing a UI</a></div></li>
<li><div><a href="<?cs var:toroot ?>devel/building-blocks.html">Building Blocks</a></div></li>
<li><div><a href="<?cs var:toroot ?>devel/data.html">Data Storage and Retrieval</a></div></li>
<li><div><a href="<?cs var:toroot ?>devel/security.html">Security Model</a></div></li>
<li><div><a href="<?cs var:toroot ?>devel/resources-i18n.html">Resources and i18n</a></div></li>
</ul>
</li>
<li><div><a href="<?cs var:toroot ?>toolbox/index.html">Developer Toolbox</a></div>
<ul>
<li><div><a href="<?cs var:toroot ?>toolbox/philosophy.html">Design Philosophy</a></div></li>
<li><div><a href="<?cs var:toroot ?>toolbox/custom-components.html">Building Custom Components</a></div></li>
<li><div><a href="<?cs var:toroot ?>toolbox/optional-apis.html">Optional APIs</a></div></li>
</ul>
</li>
<li><div><a href="<?cs var:toroot ?>samples/index.html">Sample Code</a></div>
<ul>
<li><div><a href="<?cs var:toroot ?>samples/ApiDemos/index.html">API Demos</a></div></li>
<li><div><a href="<?cs var:toroot ?>samples/LunarLander/index.html">Lunar Lander</a></div></li>
<li><div><a href="<?cs var:toroot ?>samples/NotePad/index.html">Note Pad</a></div></li>
</ul>
</li>
<li> <a href="<?cs var:toroot ?>reference/index.html"><strong>Reference Information</strong></a>
<ul>
<li><a href="<?cs var:toroot ?>reference/packages.html">Package Index</a></li>
<li><a href="<?cs var:toroot ?>reference/classes.html">Class Index</a></li>
<li><a href="<?cs var:toroot ?>reference/hierarchy.html">Class Hierarchy</a></li>
<li><a href="<?cs var:toroot ?>reference/view-gallery.html">List of Views</a></li>
<li><a href="<?cs var:toroot ?>reference/available-intents.html">List of Intents</a></li>
<li><a href="<?cs var:toroot ?>reference/android/Manifest.permission.html">List of Permissions</a></li>
<li><a href="<?cs var:toroot ?>reference/available-resources.html">List of Resource Types</a></li>
<li><a href="<?cs var:toroot ?>reference/aidl.html">Android IDL</a></li>
<li><a href="<?cs var:toroot ?>reference/glossary.html">Glossary</a></li>
<li><a href="<?cs var:toroot ?>reference/keywords.html">Index</a></li>
</ul>
</li>
<li><div><a href="<?cs var:toroot ?>kb/index.html">FAQs</a></div>
<ul>
<li><div><a href="<?cs var:toroot ?>kb/general.html">General</a></div></li>
<li><div><a href="<?cs var:toroot ?>kb/commontasks.html">Common Tasks</a></div></li>
<li><div><a href="<?cs var:toroot ?>kb/troubleshooting.html">Troubleshooting</a></div></li>
<li><div><a href="<?cs var:toroot ?>kb/licensingandoss.html">Open Source Licensing</a></div></li>
<li><div><a href="<?cs var:toroot ?>kb/framework.html">Application Framework</a></div></li>
<li><div><a href="<?cs var:toroot ?>kb/security.html">Security</a></div></li>
</ul>
</li>
<li><div><a href="<?cs var:toroot ?>roadmap.html">Roadmap</a></div></li>
<li><div><a href="<?cs var:toroot ?>goodies/index.html">Goodies</a></div></li>
</ul>

View File

@ -5,80 +5,84 @@
elif:home ?>home<?cs
elif:community ?>community<?cs
elif:videos ?>videos<?cs /if ?>">
<li id="home-link"><a href="<?cs var:toroot ?><?cs if:android.whichdoc != "online" ?>offline.html<?cs else ?>index.html<?cs /if ?>">
<?cs if:!sdk.redirect ?>
<?cs if:android.whichdoc == "online" ?>
<li id="home-link"><a href="<?cs var:toroot ?>index.html">
<?cs if:!sdk.redirect ?>
<span class="en">Home</span>
<span class="de">Startseite</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 ?>
<span style="display:none" class="de">Startseite</span>
<span style="display:none" class="es"></span>
<span style="display:none" class="fr"></span>
<span style="display:none" class="it"></span>
<span style="display:none" class="ja"></span>
<span style="display:none" class="zh-CN"></span>
<span style="display:none" class="zh-TW"></span>
<?cs /if ?>
</a></li>
<li id="sdk-link"><a href="<?cs var:toroot ?>sdk/<?cs var:sdk.current ?>/index.html">
<?cs /if ?> <?cs # end of "if online" ?>
<li id="sdk-link"><a href="<?cs var:toroot ?>sdk/<?cs
if:android.whichdoc != "online" ?>offline-welcome.html<?cs
else ?><?cs var:sdk.current ?>/index.html<?cs /if ?>">
<span class="en">SDK</span>
</a></li>
<li id="guide-link"><a href="<?cs var:toroot ?>guide/index.html" onClick="return loadLast('guide')">
<?cs if:!sdk.redirect ?>
<span class="en">Dev Guide</span>
<span class="de">Handbuch</span>
<span class="es">Guía</span>
<span class="fr">Guide</span>
<span class="it">Guida</span>
<span class="ja"></span>
<span class="zh-CN"></span>
<span class="zh-TW"></span>
<span style="display:none" class="de">Handbuch</span>
<span style="display:none" class="es">Guía</span>
<span style="display:none" class="fr">Guide</span>
<span style="display:none" class="it">Guida</span>
<span style="display:none" class="ja"></span>
<span style="display:none" class="zh-CN"></span>
<span style="display:none" class="zh-TW"></span>
<?cs /if ?>
</a></li>
<li id="reference-link"><a href="<?cs var:toroot ?>reference/packages.html" onClick="return loadLast('reference')">
<?cs if:!sdk.redirect ?>
<span class="en">Reference</span>
<span class="de">Referenz</span>
<span class="es">Referencia</span>
<span class="fr">Référence</span>
<span class="it">Riferimento</span>
<span class="ja"></span>
<span class="zh-CN"></span>
<span class="zh-TW"></span>
<span style="display:none" class="de">Referenz</span>
<span style="display:none" class="es">Referencia</span>
<span style="display:none" class="fr">Référence</span>
<span style="display:none" class="it">Riferimento</span>
<span style="display:none" class="ja"></span>
<span style="display:none" class="zh-CN"></span>
<span style="display:none" class="zh-TW"></span>
<?cs /if ?>
</a></li>
<li><a href="http://android-developers.blogspot.com" onClick="return requestAppendHL(this.href)">
<?cs if:!sdk.redirect ?>
<span class="en">Blog</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>
<span style="display:none" class="de"></span>
<span style="display:none" class="es"></span>
<span style="display:none" class="fr"></span>
<span style="display:none" class="it"></span>
<span style="display:none" class="ja"></span>
<span style="display:none" class="zh-CN"></span>
<span style="display:none" class="zh-TW"></span>
<?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="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>
<span style="display:none" class="de"></span>
<span style="display:none" class="es"></span>
<span style="display:none" class="fr"></span>
<span style="display:none" class="it"></span>
<span style="display:none" class="ja"></span>
<span style="display:none" class="zh-CN"></span>
<span style="display:none" class="zh-TW"></span>
<?cs /if ?>
</a></li>
<li id="community-link"><a href="<?cs var:toroot ?>community/index.html">
<?cs if:!sdk.redirect ?>
<span class="en">Community</span>
<span class="de"></span>
<span class="es">Comunidad</span>
<span class="fr">Communauté</span>
<span class="it"></span>
<span class="ja"></span>
<span class="zh-CN"></span>
<span class="zh-TW"></span>
<span style="display:none" class="de"></span>
<span style="display:none" class="es">Comunidad</span>
<span style="display:none" class="fr">Communauté</span>
<span style="display:none" class="it"></span>
<span style="display:none" class="ja"></span>
<span style="display:none" class="zh-CN"></span>
<span style="display:none" class="zh-TW"></span>
<?cs /if ?>
</a></li>