diff --git a/docs/html/guide/appendix/api-levels.jd b/docs/html/guide/appendix/api-levels.jd index 5898fe5b675b2..6ab0fc2af8d7e 100644 --- a/docs/html/guide/appendix/api-levels.jd +++ b/docs/html/guide/appendix/api-levels.jd @@ -294,12 +294,11 @@ Manager.

To run your application against different platform versions in the emulator, create an AVD for each platform version that you want to test. For more information about AVDs, see Android Virtual Devices. If +href="{@docRoot}guide/developing/devices/index.html">Creating and Managing Virtual Devices. If you are using a physical device for testing, ensure that you know the API Level of the Android platform it runs. See the table at the top of this document for a list of platform versions and their API Levels.

-

Using a Provisional API Level

In some cases, an "Early Look" Android SDK platform may be available. To let diff --git a/docs/html/guide/appendix/glossary.jd b/docs/html/guide/appendix/glossary.jd index 97669ba2b679c..06fdef286dacb 100644 --- a/docs/html/guide/appendix/glossary.jd +++ b/docs/html/guide/appendix/glossary.jd @@ -91,8 +91,7 @@ page.title=Glossary with the SDK. It provides screen capture, log dump, and process examination capabilities. If you are developing in Eclipse using the ADT Plugin, DDMS is integrated into your development environment. See Dalvik Debug Monitor - Server to learn more about the program. + href="{@docRoot}guide/developing/debugging/ddms.html">Using DDMS to learn more about the program.

Dialog
A floating window that that acts as a lightweight form. A dialog can have button controls only and is intended to perform a diff --git a/docs/html/guide/developing/building/index.jd b/docs/html/guide/developing/building/index.jd index 83a7bb392dc3e..b001ebcc6d37c 100644 --- a/docs/html/guide/developing/building/index.jd +++ b/docs/html/guide/developing/building/index.jd @@ -1,4 +1,4 @@ -page.title=Building and Running Applications +page.title=Building and Running Apps @jd:body
@@ -54,6 +54,7 @@ page.title=Building and Running Applications

The general process for a typical build is outlined below:

-
Dalvik Debug Monitor +
Dalvik Debug Monitor Server
DDMS is a graphical program that communicates with your devices through adb. DDMS can capture screenshots, gather thread and stack information, spoof incoming calls and SMS messages, and has many other features.
-
Device or - Emulator
+
Device or + Android Virtual Device
-
Your application must run in a device or emulator so that it can be debugged. An adb device +
Your application must run in a device or in an AVD so that it can be debugged. An adb device daemon runs on the device or emulator and provides a means for the adb host daemon to - communicate with the device.
+ communicate with the device or emulator.
JDWP debugger
diff --git a/docs/html/guide/developing/devices/emulator.jd b/docs/html/guide/developing/devices/emulator.jd index 08fb89d4d836e..a3cd5c52c0a23 100644 --- a/docs/html/guide/developing/devices/emulator.jd +++ b/docs/html/guide/developing/devices/emulator.jd @@ -33,7 +33,6 @@ page.title=Using the Android Emulator - Image of the Android Emulator

The Android SDK includes a virtual mobile device emulator @@ -119,9 +118,10 @@ user data, SD card, and so on. When you launch the emulator with an AVD configur it automatically loads the user data and SD card data from the AVD directory. By default, the emulator stores the user data, SD card data, and cache in the AVD directory.

-

To create and manage AVDs you use the android tool, a command-line utility -included in the SDK. For complete information about how to set up AVDs, see Android Virtual Devices.

+

To create and manage AVDs you use the AVD Manager UI or the android tool +that is included in the SDK. +For complete information about how to set up AVDs, see Creating and Managing Virtual Devices.

@@ -352,8 +352,8 @@ Here's the command-line usage for launching the emulator with options:

Required. Specifies the AVD to load for this emulator instance. You must create an AVD configuration before launching the emulator. For - information, see Android - Virtual Devices. + information, see Creating and Managing + Virtual Devices with AVD Manager. Disk Images -cache <filepath> @@ -708,7 +708,8 @@ option. Using this option may yield unexpected and in some cases misleading results, since the density with which to render the skin may not be defined. AVDs let you associate each skin with a default density and override the default as needed. For more information, see Android Virtual Devices. +href="{@docRoot}guide/developing/devices/managing-avds.html">Creating and Managing Virtual Devices +with AVD Manager. @@ -718,15 +719,6 @@ href="{@docRoot}guide/developing/tools/avd.html">Android Virtual Devices. - - - - - - - - -

Working with Emulator Disk Images

@@ -892,7 +884,7 @@ emulated SD card and load it in the emulator, see SD Card Emul

You can also use the android tool to automatically create an SD Card image for you, when creating an AVD. For more information, see Command-line options for AVDs. +href="{@docRoot}guide/developing/devices/managing-avds.html">Creating and Managing Virtual Devices with AVD Manager.

Temporary Images

@@ -1643,7 +1635,7 @@ kilobits/sec):

Using Emulator Skins

The Android SDK includes several Emulator skins that you can use to control the resolution and density of the emulated device's screen. To select a specific skin for running the emulator, create an AVD that uses that skin. Please do not use deprecated emulator options such as -skin to control the skin used by an emulator instance. For more information about AVDs, see Android Virtual Devices.

+href="{@docRoot}guide/developing/devices/index.html">Creating and Managing Virtual Devices.

@@ -1662,9 +1654,9 @@ instance-specific storage area.

If you don't have access to Eclipse or the ADT Plugin, you can install your application on the emulator using -the adb utility. Before installing the application, you need to package it -in a .apk file using the Android Asset Packaging Tool. -Once the application is installed, you can start the emulator from the command +the adb utility. Before installing the application, you need to build and package it +into an .apk as described in Building and +Running Apps. Once the application is installed, you can start the emulator from the command line, as described in this document, using any startup options necessary. When the emulator is running, you can also connect to the emulator instance's console to issue commands as needed.

@@ -1707,7 +1699,7 @@ creating an AVD, you simply specify the -c option, like this:

You can also use the -c option to specify a path to an SD card image to use in the new AVD. For more information, see Android Virtual Devices. +href="{@docRoot}guide/developing/devices/managing-avds-cmdline.html">Creating and Managing Virtual Devices on the Command Line.

Creating an SD card image using mksdcard

@@ -1722,7 +1714,7 @@ the tools/ directory of the SDK and create a disk image like this: 

mksdcard 1024M sdcard1.iso
-

For more information, see Other Tools.

+

For more information, see mksdcard.

Copying Files to a Disk Image

diff --git a/docs/html/guide/developing/tools/adb.jd b/docs/html/guide/developing/tools/adb.jd index 3c6351e73aa3f..bcdc2e612758f 100644 --- a/docs/html/guide/developing/tools/adb.jd +++ b/docs/html/guide/developing/tools/adb.jd @@ -171,7 +171,7 @@ emulator-5558  device 
adb install <path_to_apk>
-

For more information about how to create an .apk file that you can install on an emulator/device instance, see Android Asset Packaging Tool (aapt).

+

For more information about how to create an .apk file that you can install on an emulator/device instance, see Building and Running Apps

Note that, if you are using the Eclipse IDE and have the ADT plugin installed, you do not need to use adb (or aapt) directly to install your application on the emulator/device. Instead, the ADT plugin handles the packaging and installation of the application for you.

@@ -465,7 +465,8 @@ application and send 500 pseudo-random events to it.

dumpsys Dumps system data to the screen. -The Dalvik Debug Monitor Service (DDMS) tool offers integrated debug environment that you may find easier to use. +The Dalvik Debug Monitor Server +(DDMS) tool offers integrated debug environment that you may find easier to use. diff --git a/docs/html/guide/developing/tools/emulator.jd b/docs/html/guide/developing/tools/emulator.jd index e255087e1b292..9baf1a1829d36 100644 --- a/docs/html/guide/developing/tools/emulator.jd +++ b/docs/html/guide/developing/tools/emulator.jd @@ -12,7 +12,7 @@ invoke certain keys on the device.

This document is a reference to the available command line options and the keyboard mapping to device keys. For a complete guide to using the Android Emulator, see -Using the Android Emulator. +Using the Android Emulator.

Emulator Startup Options

@@ -85,8 +85,8 @@ Here's the command-line usage for launching the emulator with options:

Required. Specifies the AVD to load for this emulator instance. You must create an AVD configuration before launching the emulator. For - information, see Android - Virtual Devices. + information, see + Creating and Managing AVDs with AVD Manager. Disk Images -cache <filepath> @@ -439,7 +439,8 @@ option. Using this option may yield unexpected and in some cases misleading results, since the density with which to render the skin may not be defined. AVDs let you associate each skin with a default density and override the default as needed. For more information, see Android Virtual Devices. +href="{@docRoot}guide/developing/devices/managing-avds.html#createavd"> +Creating and Managing Virtual Devices with AVD Manager. diff --git a/docs/html/guide/practices/screens_support.jd b/docs/html/guide/practices/screens_support.jd index 5738bd64ec699..520bd28853e48 100644 --- a/docs/html/guide/practices/screens_support.jd +++ b/docs/html/guide/practices/screens_support.jd @@ -38,7 +38,7 @@ page.title=Supporting Multiple Screens
  • Providing Alternative Resources
    • -
  • Android Virtual Devices
    • +
  • Creating and Managing Virtual Devices
    • @@ -1205,7 +1205,7 @@ includes several emulator skins to get you started. You can use the Android AVD Manager or the android tool to create AVDs that use the various emulator skins and you can also set up custom AVDs to test densities other than the defaults. For general information about working with AVDs, see -Android Virtual +Creating and Managing Virtual Devices.

    The Android SDK provides a set of default emulator skins that you can use for diff --git a/docs/html/guide/topics/fundamentals.jd b/docs/html/guide/topics/fundamentals.jd index fffc1cd945c39..1658fa65daee0 100644 --- a/docs/html/guide/topics/fundamentals.jd +++ b/docs/html/guide/topics/fundamentals.jd @@ -52,10 +52,9 @@ page.title=Application Fundamentals

    Android applications are written in the Java programming language. The compiled Java code — along with any data and resource -files required by the application — is bundled by the -aapt -tool into an Android package, an archive file -marked by an {@code .apk} suffix. This file is the vehicle +files required by the application — is bundled into an +Android package, an archive file +marked by an {@code .apk} suffix. This file is the vehicle for distributing the application and installing it on mobile devices; it's the file users download to their devices. All the code in a single {@code .apk} file is considered to be one application. @@ -425,7 +424,7 @@ elements for broadcast receivers, and <provider> elements for content providers. Activities, services, and content providers that are not declared in the manifest are not visible to the system and are -consequently never run. However, broadcast receivers can either be +consequently never run. However, broadcast receivers can either be declared in the manifest, or they can be created dynamically in code (as {@link android.content.BroadcastReceiver} objects) and registered with the system by calling diff --git a/docs/html/guide/topics/graphics/2d-graphics.jd b/docs/html/guide/topics/graphics/2d-graphics.jd index 5759be5bf97a8..05f40238925d5 100644 --- a/docs/html/guide/topics/graphics/2d-graphics.jd +++ b/docs/html/guide/topics/graphics/2d-graphics.jd @@ -61,7 +61,7 @@ extension (E.g., my_image.png is referenced as my_image)

    Note: Image resources placed in res/drawable/ may be automatically optimized with lossless image compression by the -aapt tool. For example, a true-color PNG that does +aapt tool during the build process. For example, a true-color PNG that does not require more than 256 colors may be converted to an 8-bit PNG with a color palette. This will result in an image of equal quality but which requires less memory. So be aware that the image binaries placed in this directory can change during the build. If you plan on reading diff --git a/docs/html/guide/topics/location/obtaining-user-location.jd b/docs/html/guide/topics/location/obtaining-user-location.jd index bc782d2e97343..3b450f0d403ac 100644 --- a/docs/html/guide/topics/location/obtaining-user-location.jd +++ b/docs/html/guide/topics/location/obtaining-user-location.jd @@ -421,8 +421,8 @@ lat/long coordinates, with a GPX file for route playback, or a KML file for mult

  • Use a KML file describing individual place marks for sequenced playback to the device.
    • -

    For more information on using DDMS to spoof location data, see the -Using DDMS guide. +

    For more information on using DDMS to spoof location data, see +Using DDMS.

    Using the "geo" command in the emulator console

    @@ -451,4 +451,4 @@ lat/long coordinates, with a GPX file for route playback, or a KML file for mult

    For information about how to connect to the emulator console, see -Using the Emulator Console.

    +Using the Emulator Console.

    diff --git a/docs/html/guide/topics/resources/drawable-resource.jd b/docs/html/guide/topics/resources/drawable-resource.jd index d9f619f2b7489..cee8fc3fcc42d 100644 --- a/docs/html/guide/topics/resources/drawable-resource.jd +++ b/docs/html/guide/topics/resources/drawable-resource.jd @@ -74,7 +74,7 @@ android:drawable="@color/green"}).

    alias resource ID in XML.

    Note: Bitmap files may be automatically optimized with lossless -image compression by the aapt tool. For +image compression by the aapt tool during the build process. For example, a true-color PNG that does not require more than 256 colors may be converted to an 8-bit PNG with a color palette. This will result in an image of equal quality but which requires less memory. So be aware that the image binaries placed in this directory can change during the build. If diff --git a/docs/html/guide/topics/testing/testing_android.jd b/docs/html/guide/topics/testing/testing_android.jd index d4b0dcc24f1fb..6f3048c17bc59 100755 --- a/docs/html/guide/topics/testing/testing_android.jd +++ b/docs/html/guide/topics/testing/testing_android.jd @@ -625,9 +625,8 @@ The UI/Application Exerci

    When possible, you should run these tests on an actual device. If this is not possible, you can - use the Android Emulator with - Android Virtual Devices configured for - the hardware, screens, and versions you want to test. + use the Android Emulator with + Android Virtual Devices configured for the hardware, screens, and versions you want to test.

    Next Steps

    diff --git a/docs/html/guide/topics/ui/declaring-layout.jd b/docs/html/guide/topics/ui/declaring-layout.jd index 843414a357a50..c34876751fa23 100644 --- a/docs/html/guide/topics/ui/declaring-layout.jd +++ b/docs/html/guide/topics/ui/declaring-layout.jd @@ -47,11 +47,11 @@ application can create View and ViewGroup objects (and manipulate their properti Plugin for Eclipse offers a layout preview of your XML — with the XML file opened, select the Layout tab.

  • You should also try the - Hierarchy Viewer tool, + Hierarchy Viewer tool, for debugging layouts — it reveals layout property values, draws wireframes with padding/margin indicators, and full rendered views while you debug on the emulator or device.
    • -
  • The layoutopt tool lets +
  • The layoutopt tool lets you quickly analyze your layouts and hierarchies for inefficiencies or other problems.
    • diff --git a/docs/html/guide/webapps/debugging.jd b/docs/html/guide/webapps/debugging.jd index ee4b723c246b1..c0dce48813c05 100644 --- a/docs/html/guide/webapps/debugging.jd +++ b/docs/html/guide/webapps/debugging.jd @@ -18,7 +18,7 @@ messages

    See also

      -
    1. Debugging Tasks
      2. +
    2. Debugging
    @@ -46,8 +46,8 @@ those written using JavaScript {@code console} APIs.

    Device > Run logcat. When using the ADT plugin for Eclipse, you can also view logcat messages by opening the Logcat view, available from Window > Show View > Other > Android > Logcat.

    -

    See Debugging -Tasks for more information about logcat.

    +

    See Debugging + for more information about .

    diff --git a/docs/html/sdk/RELEASENOTES.jd b/docs/html/sdk/RELEASENOTES.jd index a94eba7a0a872..bf091e9956b26 100644 --- a/docs/html/sdk/RELEASENOTES.jd +++ b/docs/html/sdk/RELEASENOTES.jd @@ -64,7 +64,7 @@ changes include:

    skins.
  • Android SDK and AVD Manager, a graphical UI to let you manage your SDK and AVD environments more easily. The tool lets you create and manage -your Android Virtual +your Android Virtual Devices and download new SDK packages (such as platform versions and add-ons) into your environment.
  • Improved support for test packages in New Project Wizard
    • @@ -222,7 +222,7 @@ skins, including:

    density for each skin, to create any combination of resolution/density (WVGA with medium density, for instance). To do so, use the android tool command line to create a new AVD that uses a custom hardware configuration. See -Creating an +Creating an AVD for more information.

    Other Notes and Resolved Issues

    @@ -330,7 +330,7 @@ changes include:

    Android 1.5). The tools are updated to let you deploy your application on any platform in the SDK, which helps you ensure forward-compatibility and, if applicable, backward-compatibility. -
  • Introduces Android +
  • Introduces Android Virtual Devices — (AVD) configurations of options that you run in the emulator to better model actual devices. Each AVD gets its own dedicated storage area, making it much easier to work with multiple emulators @@ -407,7 +407,7 @@ that can run in the emulator. available to use.

    For more information about AVDs, see Android Virtual Devices +href="{@docRoot}guide/developing/devices/index.html">Creating and Managing Virtual Devices

    Other Notes

    @@ -585,8 +585,7 @@ these USB drivers that you can install, to let you develop on the device:

    The USB driver files are located in the <SDK>/usb_driver directory. For details and installation instructions, see Setting Up a -Device for Development.

    +href="{@docRoot}guide/developing/device.html#setting-up">Connecting Hardware Devices.

    Resolved Issues, Changes