diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/guide/appendix/faq/commontasks.jd | 13 | ||||
| -rw-r--r-- | docs/html/guide/developing/device.jd | 2 | ||||
| -rw-r--r-- | docs/html/guide/developing/tools/adb.jd | 2 | ||||
| -rw-r--r-- | docs/html/guide/developing/tools/aidl.jd | 1 | ||||
| -rw-r--r-- | docs/html/guide/developing/tools/ddms.jd | 13 | ||||
| -rw-r--r-- | docs/html/guide/topics/manifest/manifest-element.jd | 7 | ||||
| -rwxr-xr-x | docs/html/guide/topics/resources/resources-i18n.jd | 10 | ||||
| -rw-r--r-- | docs/html/offline.jd | 52 | ||||
| -rw-r--r-- | docs/html/sdk/sdk_toc.cs | 106 |
9 files changed, 118 insertions, 88 deletions
diff --git a/docs/html/guide/appendix/faq/commontasks.jd b/docs/html/guide/appendix/faq/commontasks.jd index 0f89e75..e88a867 100644 --- a/docs/html/guide/appendix/faq/commontasks.jd +++ b/docs/html/guide/appendix/faq/commontasks.jd @@ -56,7 +56,7 @@ href="{@docRoot}guide/topics/fundamentals.html">Application Fundamentals</a> to understand the basics of how an Android application works.</p> <p>You should also take a look at the ApiDemos application and the other sample -applications included in the SDK, in the <code><sdk>/samples/ +applications included in the SDK, in the <code><sdk>/samples/</code> folder in the SDK.</p> <p>Finally, a great way to started with Android development in Eclipse is to @@ -281,6 +281,15 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data){ <pre>//Hide the title bar requestWindowFeature(Window.FEATURE_NO_TITLE); </pre> +<p>A better way to achieve the same end is to specify a theme in your Android +Manifest file:</p> +<pre><application android:icon="@drawable/icon" android:theme="@android:style/Theme.NoTitleBar"> +</pre> +<p>This is preferable because it tells the system not to show a title bar while +your application is starting up. With the explicit method call, your application +will have a title bar visible to the user until <code>onCreate</code> runs.</p> +<p>(Note that this can be applied to either the <code><application></code> +tag or to individual <code><activity></code> tags.)</p> <a name="localhostalias" id="localhostalias"></a><h2>Referring to localhost from the emulated environment</h2> <p> If you need to refer to your host computer's <em>localhost</em>, such as when you @@ -427,7 +436,7 @@ user receiving new e-mail.</p> <td>Activity</td> <td>By setting the theme of an activity to {@link android.R.style#Theme_Dialog - android:theme="android:style/Theme.Dialog"}, + android:theme="@android:style/Theme.Dialog"}, your activity will take on the appearance of a normal dialog, floating on top of whatever was underneath it. You usually set the theme through the diff --git a/docs/html/guide/developing/device.jd b/docs/html/guide/developing/device.jd index 5a2a751..9dea053 100644 --- a/docs/html/guide/developing/device.jd +++ b/docs/html/guide/developing/device.jd @@ -134,7 +134,7 @@ would on the emulator. There are just a few things to do before you can start.</ <code>SUBSYSTEM=="usb_device", SYSFS{idVendor}=="0bb4", MODE="0666"</code></p> </li> <li>Now execute:<br/> - <code>chmod a+rx /etc/udev/rules.d/51-android.rules</code> + <code>chmod a+r /etc/udev/rules.d/51-android.rules</code> </li> </ol> diff --git a/docs/html/guide/developing/tools/adb.jd b/docs/html/guide/developing/tools/adb.jd index b111047..e8c726f 100644 --- a/docs/html/guide/developing/tools/adb.jd +++ b/docs/html/guide/developing/tools/adb.jd @@ -313,7 +313,7 @@ emulator-5558 device</pre> <li><code><tty></code> — the tty for PPP stream. For example <code>dev:/dev/omap_csmi_ttyl</code>. </li> <li><code>[parm]... </code> &mdash zero or more PPP/PPPD options, such as <code>defaultroute</code>, <code>local</code>, <code>notty</code>, etc.</li></ul> -<p>Note that you should not automatically start a PDP connection. </p></td> +<p>Note that you should not automatically start a PPP connection. </p></td> <td></td> </tr> diff --git a/docs/html/guide/developing/tools/aidl.jd b/docs/html/guide/developing/tools/aidl.jd index f370a80..abfa8b1 100644 --- a/docs/html/guide/developing/tools/aidl.jd +++ b/docs/html/guide/developing/tools/aidl.jd @@ -194,7 +194,6 @@ started.</p> <li>Make your class implement the {@link android.os.Parcelable} interface.</li> <li>Implement the method <code>public void writeToParcel(Parcel out)</code> that takes the current state of the object and writes it to a parcel.</li> -<li>Implement the method <code>public void readFromParcel(Parcel in)</code> that reads the value in a parcel into your object.</li> <li>Add a static field called <code>CREATOR</code> to your class which is an object implementing the {@link android.os.Parcelable.Creator Parcelable.Creator} interface.</li> diff --git a/docs/html/guide/developing/tools/ddms.jd b/docs/html/guide/developing/tools/ddms.jd index fa04216..f55940d 100644 --- a/docs/html/guide/developing/tools/ddms.jd +++ b/docs/html/guide/developing/tools/ddms.jd @@ -1,7 +1,7 @@ -page.title=Using Dalvik Debug Monitor Service (DDMS) +page.title=Using the Dalvik Debug Monitor @jd:body -<p>Android ships with a debugging tool called the Dalvik Debug Monitor Service (DDMS), +<p>Android ships with a debugging tool called the Dalvik Debug Monitor Server (DDMS), which provides port-forwarding services, screen capture on the device, thread and heap information on the device, logcat, process, and radio state information, incoming call and SMS spoofing, location data spoofing, and more. This page @@ -106,7 +106,7 @@ and some pretty cool tools.</p> </ul> </li> <li> <strong>utime</strong> - cumulative time spent executing user code, in "jiffies" (usually - 10ms). Only available under Linux. </li> + 10ms). </li> <li> <strong>stime</strong> - cumulative time spent executing system code, in "jiffies" (usually 10ms). </li> <li> <strong>Name</strong> - the name of the thread</li> @@ -214,14 +214,15 @@ the emulator from command line, be sure to mount the sdcard again.)</p> <h2 id="screen-capture">Screen Capture</h2> <p>You can capture screen images on the device or emulator by selecting <strong>Device</strong> - > <strong>Screen capture...</strong> in the menu bar, or press CTRL-S.</p> + > <strong>Screen capture...</strong> in the menu bar, or press CTRL-S. + Be sure to select a device first.</p> <h2 id="exploring-processes">Exploring Processes</h2> <p>You can see the output of <code>ps -x</code> for a specific VM by selecting <strong>Device</strong> > <strong>Show process status</strong>... in the menu bar.</p> <h2 id="cause-a-gc-to-occur">Cause a GC to Occur</h2> -<p>Cause garbage collection to occury by pressing the trash can button on the toolbar. </p> +<p>Cause garbage collection to occur in the selected application by pressing the trash can button on the toolbar. </p> <h2 id="running-dumpsys-and-dumpstate">Running Dumpsys and Dumpstate on the Device (logcat)<a name="logcat" id="logcat"></a> </h2> <ul> @@ -239,7 +240,7 @@ the emulator from command line, be sure to mount the sdcard again.)</p> <h2 id="stop-a-vitrual-machine">Stop a Virtual Machine </h2> <p>You can stop a virtual machine by selecting <strong>Actions</strong> > <strong>Halt -VM</strong>. Pressing this button causes the VM to call <code>System.exit(1)</code>.</p> +VM</strong>. Pressing this button causes the VM to call <code>Runtime.halt(1)</code>.</p> <h2 id="known-issues" style="color:#FF0000">Known issues with DDMS </h2> <p>DDMS has the following known limitations:</p> diff --git a/docs/html/guide/topics/manifest/manifest-element.jd b/docs/html/guide/topics/manifest/manifest-element.jd index a9d1090..48e598a 100644 --- a/docs/html/guide/topics/manifest/manifest-element.jd +++ b/docs/html/guide/topics/manifest/manifest-element.jd @@ -44,8 +44,11 @@ to "{@code http://schemas.android.com/apk/res/android}".</dd> <dt><a name="package"></a>{@code package}</dt> <dd>A full Java package name for the application. The name should -be unique. For example, applications published by Google could have -names in the form <code>com.google.app.<i>application_name</i></code>. +be unique. The name may contain uppercase or lowercase letters ('A' +through 'Z'), numbers, and underscores ('_'). However, individual +package name parts may only start with letters. For example, applications +published by Google could have names in the form +<code>com.google.app.<i>application_name</i></code>. <p> The package name serves as a unique identifier for the application. diff --git a/docs/html/guide/topics/resources/resources-i18n.jd b/docs/html/guide/topics/resources/resources-i18n.jd index e9b8af7..091bc62 100755 --- a/docs/html/guide/topics/resources/resources-i18n.jd +++ b/docs/html/guide/topics/resources/resources-i18n.jd @@ -441,7 +441,7 @@ resources for a fully specified configuration would look like this:</p> <pre> MyApp/ res/ - drawable-en-rUS-large-long-port-mdpi-finger-keysexposed-qwerty-dpad-480x320/ + drawable-en-rUS-large-long-port-mdpi-finger-keysexposed-qwerty-navexposed-dpad-480x320/ </pre> <p>More typically, you will only specify a few specific configuration options. You may drop any of the values from the @@ -575,6 +575,14 @@ MyApp/ <td><code>nokeys</code>, <code>qwerty</code>, <code>12key</code> </td> </tr> <tr> + <td>Whether the navigation keys are available to the user</td> + <td><p><code>navexposed</code>, <code>navhidden</code> + </p><p> + If the hardware's navigation keys are currently available to + the user, the navexposed resources will be used; if they are not + available (such as behind a closed lid), navhidden will be used.</p></td> + </tr> + <tr> <td>Primary non-touchscreen<br /> navigation method</td> <td><code>nonav</code>, <code>dpad</code>, <code>trackball</code>, <code>wheel</code> </td> diff --git a/docs/html/offline.jd b/docs/html/offline.jd index a42e346..78e2679 100644 --- a/docs/html/offline.jd +++ b/docs/html/offline.jd @@ -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> diff --git a/docs/html/sdk/sdk_toc.cs b/docs/html/sdk/sdk_toc.cs index 7a21e4a..143a38d 100644 --- a/docs/html/sdk/sdk_toc.cs +++ b/docs/html/sdk/sdk_toc.cs @@ -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"> |