diff options
| -rw-r--r-- | docs/html/guide/basics/what-is-android.jd | 8 | ||||
| -rw-r--r-- | docs/html/guide/guide_toc.cs | 119 | ||||
| -rw-r--r-- | docs/html/guide/samples/index.jd | 46 | ||||
| -rw-r--r-- | docs/html/samples/index.jd | 22 |
4 files changed, 100 insertions, 95 deletions
diff --git a/docs/html/guide/basics/what-is-android.jd b/docs/html/guide/basics/what-is-android.jd index b75321b..668e62e 100644 --- a/docs/html/guide/basics/what-is-android.jd +++ b/docs/html/guide/basics/what-is-android.jd @@ -3,7 +3,7 @@ page.title=What is Android? <p>Android is a software stack for mobile devices that includes an operating system, middleware and key applications. The <a -href="http://code.google.com/android/download.html">Android SDK</a> +href="http://developer.android.com/sdk/index.html">Android SDK</a> provides the tools and APIs necessary to begin developing applications on the Android platform using the Java programming language.</p> @@ -48,6 +48,12 @@ others. All applications are written using the Java programming language.</p> <a name="application_framework" id="application_framework"></a> <h2>Application Framework</h2> +<p>By providing an open development platform, Android +offers developers the ability to build extremely rich and innovative +applications. Developers are free to take advantage of the +device hardware, access location information, run background services, set alarms, +add notifications to the status bar, and much, much more. </p> + <p>Developers have full access to the same framework APIs used by the core applications. The application architecture is designed to simplify the reuse of components; any application can publish its capabilities and any other diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs index 5215202..5fbfd4e 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -9,25 +9,26 @@ <li> <h2><span class="en">Android Basics</span> - <span class="de">Einführung in Android</span> - <span class="es">Información básica sobre Android</span> - <span class="fr">Présentation d'Android</span> - <span class="it">Nozioni di base su Android</span> - <span class="ja">Android の基本</span> - <span class="zh-CN">Android 基础知识</span> - <span class="zh-TW">Android 簡介</span> + <span class="de" style="display:none">Einführung in Android</span> + <span class="es" style="display:none">Información básica sobre Android</span> + <span class="fr" style="display:none">Présentation d'Android</span> + <span class="it" style="display:none">Nozioni di base su Android</span> + <span class="ja" style="display:none">Android の基本</span> + <span class="zh-CN" style="display:none">Android 基础知识</span> + <span class="zh-TW" style="display:none">Android 簡介</span> </h2> <ul> <li><a href="<?cs var:toroot ?>guide/basics/what-is-android.html"> <span class="en">What Is Android?</span> - <span class="de">Was ist Android?</span> - <span class="es">¿Qué es Android?</span> - <span class="fr">Qu'est-ce qu'Android ?</span> - <span class="it">Che cos'è Android?</span> - <span class="ja">Android とは</span> - <span class="zh-CN">Android 是什么？</span> - <span class="zh-TW">什麼是 Android？</span> + <span class="de" style="display:none">Was ist Android?</span> + <span class="es" style="display:none">¿Qué es Android?</span> + <span class="fr" style="display:none">Qu'est-ce qu'Android ?</span> + <span class="it" style="display:none">Che cos'è Android?</span> + <span class="ja" style="display:none">Android とは</span> + <span class="zh-CN" style="display:none">Android 是什么？</span> + <span class="zh-TW" style="display:none">什麼是 Android？</span> </a></li> + <!-- <li><a style="color:gray;">The Android SDK</a></li> --> <!-- <li><a style="color:gray;">Walkthrough for Developers</a></li> --> <!-- quick overview of what it's like to develop on Android --> @@ -37,13 +38,13 @@ <li> <h2> <span class="en">Framework Topics</span> - <span class="de">Framework-Themen</span> - <span class="es">Temas sobre el framework</span> - <span class="fr">Thèmes relatifs au framework</span> - <span class="it">Argomenti relativi al framework</span> - <span class="ja">フレームワーク トピック</span> - <span class="zh-CN">框架主题</span> - <span class="zh-TW">架構主題</span> + <span class="de" style="display:none">Framework-Themen</span> + <span class="es" style="display:none">Temas sobre el framework</span> + <span class="fr" style="display:none">Thèmes relatifs au framework</span> + <span class="it" style="display:none">Argomenti relativi al framework</span> + <span class="ja" style="display:none">フレームワーク トピック</span> + <span class="zh-CN" style="display:none">框架主题</span> + <span class="zh-TW" style="display:none">架構主題</span> </h2> <ul> <li><a href="<?cs var:toroot ?>guide/topics/fundamentals.html"> @@ -202,13 +203,13 @@ <li> <h2><span class="en">Developing</span> - <span class="de">Entwicklung</span> - <span class="es">Desarrollo</span> - <span class="fr">Développement</span> - <span class="it">Sviluppo</span> - <span class="ja">開発</span> - <span class="zh-CN">开发</span> - <span class="zh-TW">開發</span> + <span class="de" style="display:none">Entwicklung</span> + <span class="es" style="display:none">Desarrollo</span> + <span class="fr" style="display:none">Développement</span> + <span class="it" style="display:none">Sviluppo</span> + <span class="ja" style="display:none">開発</span> + <span class="zh-CN" style="display:none">开发</span> + <span class="zh-TW" style="display:none">開發</span> </h2> <ul> <!--<li><a href="">Developing for Android</a></li> @@ -270,13 +271,13 @@ <li> <h2><span class="en">Publishing</span> - <span class="de">Veröffentlichung</span> - <span class="es">Publicación</span> - <span class="fr">Publication</span> - <span class="it">Pubblicazione</span> - <span class="ja">公開</span> - <span class="zh-CN">发布</span> - <span class="zh-TW">發佈</span> + <span class="de" style="display:none">Veröffentlichung</span> + <span class="es" style="display:none">Publicación</span> + <span class="fr" style="display:none">Publication</span> + <span class="it" style="display:none">Pubblicazione</span> + <span class="ja" style="display:none">公開</span> + <span class="zh-CN" style="display:none">发布</span> + <span class="zh-TW" style="display:none">發佈</span> </h2> <ul> <li><a href="<?cs var:toroot ?>guide/publishing/app-signing.html"> @@ -317,13 +318,13 @@ <li> <h2><span class="en">Best Practices</span> - <span class="de">Bewährte Verfahren</span> - <span class="es">Prácticas recomendadas</span> - <span class="fr">Meilleures pratiques</span> - <span class="it">Best practice</span> - <span class="ja">ベスト プラクティス</span> - <span class="zh-CN">最佳实践</span> - <span class="zh-TW">最佳實務</span> + <span class="de" style="display:none">Bewährte Verfahren</span> + <span class="es" style="display:none">Prácticas recomendadas</span> + <span class="fr" style="display:none">Meilleures pratiques</span> + <span class="it" style="display:none">Best practice</span> + <span class="ja" style="display:none">ベスト プラクティス</span> + <span class="zh-CN" style="display:none">最佳实践</span> + <span class="zh-TW" style="display:none">最佳實務</span> </h2> <ul> <li><a href="<?cs var:toroot ?>guide/practices/screens_support.html"> @@ -364,13 +365,13 @@ <li> <h2><span class="en">Tutorials and Sample Code</span> - <span class="de">Lernprogramme und Beispielcode</span> - <span class="es">Tutoriales y código de ejemplo</span> - <span class="fr">Didacticiels et exemple de code</span> - <span class="it">Esercitazioni e codice di esempio</span> - <span class="ja">チュートリアルとサンプル コード</span> - <span class="zh-CN">辅导手册和示例代码</span> - <span class="zh-TW">教學課程與程式碼範例</span> + <span class="de" style="display:none">Lernprogramme und Beispielcode</span> + <span class="es" style="display:none">Tutoriales y código de ejemplo</span> + <span class="fr" style="display:none">Didacticiels et exemple de code</span> + <span class="it" style="display:none">Esercitazioni e codice di esempio</span> + <span class="ja" style="display:none">チュートリアルとサンプル コード</span> + <span class="zh-CN" style="display:none">辅导手册和示例代码</span> + <span class="zh-TW" style="display:none">教學課程與程式碼範例</span> </h2> <ul> <li><a href="<?cs var:toroot ?>guide/tutorials/hello-world.html"> @@ -387,11 +388,6 @@ </a></li> </ul> <ul> - <?cs if:android.whichdoc != "online" ?> - <li><a href="<?cs var:toroot ?>../platforms/android-<?cs var:sdk.version ?>/samples"> - <span class="en">Sample Code</span> - »</a></li> - <?cs else ?> <li class="toggle-list"> <div><a href="<?cs var:toroot ?>guide/samples/index.html"> <span class="en">Sample Code</span> @@ -423,20 +419,19 @@ </a></li> </ul> </li> - <?cs /if ?> </ul> </li> <li> <h2><span class="en">Appendix</span> - <span class="de">Anhang</span> - <span class="es">Apéndice</span> - <span class="fr">Annexes</span> - <span class="it">Appendice</span> - <span class="ja">付録</span> - <span class="zh-CN">附录</span> - <span class="zh-TW">附錄</span> + <span class="de" style="display:none">Anhang</span> + <span class="es" style="display:none">Apéndice</span> + <span class="fr" style="display:none">Annexes</span> + <span class="it" style="display:none">Appendice</span> + <span class="ja" style="display:none">付録</span> + <span class="zh-CN" style="display:none">附录</span> + <span class="zh-TW" style="display:none">附錄</span> </h2> <ul> <li><a href="<?cs var:toroot ?>guide/appendix/api-levels.html"> diff --git a/docs/html/guide/samples/index.jd b/docs/html/guide/samples/index.jd index 6e79d50..06aa83c 100644 --- a/docs/html/guide/samples/index.jd +++ b/docs/html/guide/samples/index.jd @@ -3,28 +3,44 @@ page.title=Sample Code @jd:body -<p>Sometimes, the best way to learn how things are done is to just look at some code. So here - we've provided links to let you browse the source of some sample Android applications included -in the Android SDK. </p> +<p>Sometimes, the best way to learn how things are done is to look at some code. +Here, you can browse the source of some sample Android applications that are included +in the Android SDK.</p> -<p>The SDK includes a full set of sample applications for each Android platform version -in the SDK. You can find the sample applications for each platform version in this location:</p> +<p>Each version of the Android platform available for the SDK includes a full set of sample +applications (which may vary between different versions of the platform). +You can find the samples in your SDK at:</p> -<p style="margin-left:2em"><code><sdk>/platforms/android-<version>/samples/</code></p> +<p style="margin-left:2em"> +<code><em><sdk></em>/platforms/android-<em><version></em>/samples/</code> +</p> + +<p>You can easily create new Android projects with these samples, modify them +if you'd like, then run them on an emulator or device. For example, to create +a project for the API Demos app from Eclipse, +start a new Android Project, select "Create project from existing source", then select +{@code ApiDemos} in the {@code samples/} directory. To create the API Demos project +using the {@code android} tool, execute:</p> +<pre> +android update project -s -n API Demos -t <em><target_ID></em> -p <em><path-to-platform></em>/samples/ApiDemos/ +</pre> + +<p>The pages below provide an overview of each sample application (available with most +platforms) and allow you to view the source files in your browser. </p> -<p>You can easily add these applications as projects in your development environment, so that you -can modify them and watch them execute. </p> <dl> <dt><a href="ApiDemos/index.html">API Demos</a></dt> - <dd>A variety of small applications that demonstrate an extensive collection of framework topics.</dd> + <dd>A variety of small applications that demonstrate an extensive collection of + framework topics.</dd> <dt><a href="Home/index.html">Home</a></dt> <dd>An application for saving notes. Similar (but not identical) to the <a href="{@docRoot}guide/tutorials/notepad/index.html">Notepad tutorial</a>.</dd> <dt><a href="JetBoy/index.html">JetBoy</a></dt> - <dd>JetBoy is a game that demonstrates the SONiVOX JET interactive music technology, with {@link android.media.JetPlayer}.</dd> + <dd>JetBoy is a game that demonstrates the SONiVOX JET interactive music technology, + with {@link android.media.JetPlayer}.</dd> <dt><a href="LunarLander/index.html">Lunar Lander</a></dt> <dd>A classic Lunar Lander game.</dd> @@ -44,3 +60,13 @@ can modify them and watch them execute. </p> <dd>An example of writing an input method for a software keyboard.</dd> </dl> + + +<div class="special"> +<p>For more sample applications, check out +<a href="http://code.google.com/p/apps-for-android/">apps-for-android</a>, a +collection of open source applications that demonstrate various Android APIs. +</p> +</div> + + diff --git a/docs/html/samples/index.jd b/docs/html/samples/index.jd deleted file mode 100644 index 06afd07..0000000 --- a/docs/html/samples/index.jd +++ /dev/null @@ -1,22 +0,0 @@ -page.title=Android SDK -page.onlyfortemplate=codesite -@jd:body -<h1>Sample Code</h1> - -<p>The Android SDK ships with several sample projects. They are:</p> - -<dl> - <dt><a href="{@docRoot}samples/ApiDemos/index.html">API Demos</a></dt> - <dd>A demonstration of many of the Android APIs.</dd> - - <dt><a href="{@docRoot}samples/LunarLander/index.html">Lunar Lander</a></dt> - <dd>Your objective: to land on the moon.</dd> - - <dt><a href="{@docRoot}samples/NotePad/index.html">Note Pad</a></dt> - <dd>A simple note pad application.</dd> -</dl> - -<p>To run these samples, you should <a -href="{@docRoot}guide/developing/eclipse-adt.html#creatingaproject">import them into -Eclipse</a> or build them with Ant, as described in -<a href="{@docRoot}guide/developing/other-ide.html#Building">Developing in Other IDEs</a>.</p> |