am ea1241f0: Merge change 26244 into eclair
Merge commit 'ea1241f037b0071c8948eb0b438d768cc9fa326b' into eclair-plus-aosp * commit 'ea1241f037b0071c8948eb0b438d768cc9fa326b': docs only.
This commit is contained in:
Scott Main
@@ -6,33 +6,43 @@ page.title=Welcome
|
||||
|
||||
<h1>Welcome to the Android SDK!</h1>
|
||||
|
||||
<img src="{@docRoot}images/android_icon_125.png" style="float:right; margin:1em 6em 6em;" />
|
||||
<img src="{@docRoot}assets/images/home/sdk-large.png" style="float:right; margin:-2em 3em 3em;" />
|
||||
|
||||
<p>If you've just downloaded the SDK, then continue with
|
||||
<a href="{@docRoot}sdk/{@sdkCurrent}/installing.html">Installing the Android SDK</a>.</p>
|
||||
<h3>If you've downloaded the Android SDK for the first time...</h3>
|
||||
|
||||
<p>If you're upgrading from a previously installed version, then refer to the
|
||||
<a href="{@docRoot}sdk/{@sdkCurrent}/upgrading.html">Upgrading</a> guide.</p>
|
||||
<p>Complete the online guide to
|
||||
<a href="http://developer.android.com/sdk/{@sdkCurrent}/installing.html">Installing
|
||||
the Android SDK</a>, which will help you setup your development environment
|
||||
(including the Android Development Tools plugin for Eclipse)
|
||||
so you can start developing Android apps.</p>
|
||||
|
||||
<p>Once you've completed the SDK installation, you can start learning about
|
||||
development on the Android framework by reading the <a
|
||||
href="{@docRoot}guide/index.html">Developer's Guide</a>. The SDK package
|
||||
also includes a wide variety of code samples specific to each Android
|
||||
platform. You can find the samples at this location: </p>
|
||||
<p>Once your environment is setup, look at the
|
||||
<a href="http://developer.android.com/sdk/{@sdkCurrent}/installing.html#NextSteps">Next
|
||||
Steps</a> for some pointers that will teach you about Android and get you started.</p>
|
||||
|
||||
<p style="margin-left:2em"><code><sdk>/platforms/android-<version>/samples/</code></p>
|
||||
<h3>If you've updated an existing SDK using the <em>SDK and AVD Manager</em>...</h3>
|
||||
|
||||
<p>Please note that you are currently viewing a local, offline version of the
|
||||
Android developer documentation. The offline documentation offers the same
|
||||
content and features as the online documentation, but since the search
|
||||
capability is network-based, it will not work while you are offline.
|
||||
Autocompletion for API packages and classes, also offered from the search box,
|
||||
is available both online and offline and loads the reference documentation for
|
||||
the item you select.</p>
|
||||
<p>There's no additional setup.</p>
|
||||
|
||||
<p>Newly installed Android platforms are automatically saved in the
|
||||
<code><em><sdk_dir>/</em>platforms/</code> directory of your existing SDK;
|
||||
new add-ons are saved in the <code><em><sdk_dir>/</em>add-ons/</code>
|
||||
directory; and new documentation is saved in the existing
|
||||
<code><em><sdk_dir>/</em>docs/</code> directory (old docs are replaced).</p>
|
||||
|
||||
|
||||
<hr style="margin:2em 0;" />
|
||||
|
||||
<p>Note that you are currently viewing a local, offline version of the
|
||||
Android developer documentation. The offline documentation offers almost all the same
|
||||
content and features as the online documentation. Because some features
|
||||
such as search and videos are network-based, not everything will work if you
|
||||
are not connected to the Internet.<br/><br/>
|
||||
For the most current documentation and fully-functional experience, please visit<br/>
|
||||
<strong><a href="http://developer.android.com">
|
||||
http://developer.android.com</a></strong>.
|
||||
</p>
|
||||
|
||||
<p>For the most current, fully searchable documentation, please visit</p>
|
||||
|
||||
<p style="margin-left:2em;"><a href="http://developer.android.com/index.html">
|
||||
http://developer.android.com</a>.</p>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -1,51 +1,44 @@
|
||||
<?cs if:!sdk.redirect ?>
|
||||
<ul>
|
||||
<li><?cs
|
||||
if:android.whichdoc != "online" ?>
|
||||
<h2>Android <?cs var:sdk.version ?> <?cs
|
||||
if: sdk.preview ?>Early Look SDK<?cs
|
||||
else ?>SDK, r<?cs var:sdk.rel.id ?><?cs
|
||||
/if ?></h2><?cs
|
||||
else ?>
|
||||
<h2><span class="en">Current SDK Release</span>
|
||||
<span class="de">Aktuelle SDK-Version</span>
|
||||
<span class="es">Versión actual del SDK</span>
|
||||
<span class="fr">Version actuelle du SDK</span>
|
||||
<span class="it">Release SDK attuale</span>
|
||||
<span class="ja">現在リリースされている SDK</span>
|
||||
<span class="zh-CN">当前的 SDK 版本</span>
|
||||
<span class="zh-TW">目前 SDK 發行版本</span>
|
||||
</h2><?cs
|
||||
/if ?>
|
||||
<ul><?cs
|
||||
if:android.whichdoc == "online" ?>
|
||||
if:android.whichdoc == "online" ?>
|
||||
<h2>
|
||||
<span class="en">Current SDK Release</span>
|
||||
<span style="display:none" class="de">Aktuelle SDK-Version</span>
|
||||
<span style="display:none" class="es">Versión actual del SDK</span>
|
||||
<span style="display:none" class="fr">Version actuelle du SDK</span>
|
||||
<span style="display:none" class="it">Release SDK attuale</span>
|
||||
<span style="display:none" class="ja">現在リリースされている SDK</span>
|
||||
<span style="display:none" class="zh-CN">当前的 SDK 版本</span>
|
||||
<span style="display:none" class="zh-TW">目前 SDK 發行版本</span>
|
||||
</h2>
|
||||
<ul>
|
||||
<li><a href="<?cs var:toroot ?>sdk/<?cs
|
||||
if:sdk.preview ?>preview<?cs
|
||||
else ?><?cs var:sdk.current ?><?cs
|
||||
/if ?>/index.html">
|
||||
<span class="en">Download</span>
|
||||
<span class="de">Herunterladen</span>
|
||||
<span class="es">Descargar</span>
|
||||
<span class="fr">Téléchargement</span>
|
||||
<span class="it">Download</span>
|
||||
<span class="ja">ダウンロード</span>
|
||||
<span class="zh-CN">下载</span>
|
||||
<span class="zh-TW">下載</span>
|
||||
</a></li><?cs
|
||||
/if ?>
|
||||
<span style="display:none" class="de">Herunterladen</span>
|
||||
<span style="display:none" class="es">Descargar</span>
|
||||
<span style="display:none" class="fr">Téléchargement</span>
|
||||
<span style="display:none" class="it">Download</span>
|
||||
<span style="display:none" class="ja">ダウンロード</span>
|
||||
<span style="display:none" class="zh-CN">下载</span>
|
||||
<span style="display:none" class="zh-TW">下載</span>
|
||||
</a></li>
|
||||
<li><a href="<?cs var:toroot ?>sdk/<?cs
|
||||
if:sdk.preview ?>preview<?cs
|
||||
else ?><?cs var:sdk.current ?><?cs
|
||||
/if ?>/installing.html">
|
||||
<span class="en">Installing</span>
|
||||
<span class="de">Installieren</span>
|
||||
<span class="es">Instalación</span>
|
||||
<span class="fr">Installation</span>
|
||||
<span class="it">Installazione</span>
|
||||
<span class="ja">インストール</span>
|
||||
<span class="zh-CN">安装</span>
|
||||
<span class="zh-TW">安裝</span>
|
||||
</a></li>
|
||||
<span style="display:none" class="de">Installieren</span>
|
||||
<span style="display:none" class="es">Instalación</span>
|
||||
<span style="display:none" class="fr">Installation</span>
|
||||
<span style="display:none" class="it">Installazione</span>
|
||||
<span style="display:none" class="ja">インストール</span>
|
||||
<span style="display:none" class="zh-CN">安装</span>
|
||||
<span style="display:none" class="zh-TW">安裝</span>
|
||||
</a></li>
|
||||
<li><a href="<?cs var:toroot ?>sdk/<?cs
|
||||
if:sdk.preview ?>preview<?cs
|
||||
else ?><?cs var:sdk.current ?><?cs
|
||||
@@ -54,24 +47,31 @@
|
||||
if:sdk.preview ?>preview<?cs
|
||||
else ?><?cs var:sdk.current ?><?cs
|
||||
/if ?>/requirements.html">System Requirements</a></li>
|
||||
</ul>
|
||||
</ul><?cs
|
||||
else ?> <?cs # else "if NOT online" ... ?>
|
||||
<h2>
|
||||
<span class="en">Android SDK</span>
|
||||
</h2><?cs
|
||||
/if ?> <?cs # end of "if/else online" ... ?>
|
||||
<ul>
|
||||
<li><a href="<?cs var:toroot ?>sdk/terms.html">SDK Terms and Conditions</a></li>
|
||||
<li><a href="<?cs var:toroot ?><?cs
|
||||
if:sdk.current == "preview" ?>sdk/preview/index.html<?cs
|
||||
else ?>sdk/RELEASENOTES.html<?cs
|
||||
/if ?>">SDK Release Notes</a></li>
|
||||
</ul><?cs
|
||||
</ul>
|
||||
</li><?cs
|
||||
if:android.whichdoc == "online" ?>
|
||||
<li>
|
||||
<h2><span class="en">System Image Version Notes</span>
|
||||
<span class="de">Versionshinweise zum Systemabbild</span>
|
||||
<span class="es">Notas de la versión de System Image</span>
|
||||
<span class="fr">Notes de version de l'image système</span>
|
||||
<span class="it">Note sulla versione dell'immagine <br />di sistema</span>
|
||||
<span class="ja">システム イメージ バージョンに<br />関する注意事項</span>
|
||||
<span class="zh-CN">系统图片版本说明</span>
|
||||
<span class="zh-TW">系統影像版本資訊</span>
|
||||
<h2>
|
||||
<span class="en">System Image Version Notes</span>
|
||||
<span style="display:none" class="de">Versionshinweise zum Systemabbild</span>
|
||||
<span style="display:none" class="es">Notas de la versión de System Image</span>
|
||||
<span style="display:none" class="fr">Notes de version de l'image système</span>
|
||||
<span style="display:none" class="it">Note sulla versione dell'immagine <br />di sistema</span>
|
||||
<span style="display:none" class="ja">システム イメージ バージョンに<br />関する注意事項</span>
|
||||
<span style="display:none" class="zh-CN">系统图片版本说明</span>
|
||||
<span style="display:none" class="zh-TW">系統影像版本資訊</span>
|
||||
</h2>
|
||||
<ul>
|
||||
<li><a href="<?cs var:toroot ?>sdk/android-1.6.html">Android 1.6 Version Notes</a></li>
|
||||
@@ -88,13 +88,13 @@
|
||||
<li>
|
||||
<h2>
|
||||
<span class="en">Previous SDK Releases</span>
|
||||
<span class="de">Frühere SDK-Releases</span>
|
||||
<span class="es">Versiones anteriores del SDK</span>
|
||||
<span class="fr">Anciennes versions du SDK</span>
|
||||
<span class="it">Release SDK precedenti</span>
|
||||
<span class="ja">SDK の過去のリリース</span>
|
||||
<span class="zh-CN">以前的 SDK 版本</span>
|
||||
<span class="zh-TW">較舊的 SDK 發行版本</span>
|
||||
<span style="display:none" class="de">Frühere SDK-Releases</span>
|
||||
<span style="display:none" class="es">Versiones anteriores del SDK</span>
|
||||
<span style="display:none" class="fr">Anciennes versions du SDK</span>
|
||||
<span style="display:none" class="it">Release SDK precedenti</span>
|
||||
<span style="display:none" class="ja">SDK の過去のリリース</span>
|
||||
<span style="display:none" class="zh-CN">以前的 SDK 版本</span>
|
||||
<span style="display:none" class="zh-TW">較舊的 SDK 發行版本</span>
|
||||
</h2>
|
||||
<ul>
|
||||
<li><a href="<?cs var:toroot ?>sdk/1.5_r3/index.html">Android 1.5 SDK, r3</a></li>
|
||||
@@ -103,7 +103,7 @@
|
||||
<li><a href="<?cs var:toroot ?>sdk/older_releases.html">Other Releases</a></li>
|
||||
</ul>
|
||||
</li><?cs
|
||||
/if ?>
|
||||
/if ?> <?cs # end of "if online" ?>
|
||||
</ul>
|
||||
|
||||
<script type="text/javascript">
|
||||
|
||||
Reference in New Issue
Block a user