diff --git a/docs/html/guide/developing/building/building-cmdline.jd b/docs/html/guide/developing/building/building-cmdline.jd index f40ad045414e8..a5ab07dbaaed0 100644 --- a/docs/html/guide/developing/building/building-cmdline.jd +++ b/docs/html/guide/developing/building/building-cmdline.jd @@ -1,4 +1,4 @@ -page.title=Building and Running Apps on the Command Line +page.title=Building and Running from the Command Line @jd:body
@@ -46,10 +46,9 @@ page.title=Building and Running Apps on the Command Line

Note: When installing JDK on Windows, the default is to install in the "Program Files" directory. This location will cause ant to fail, because of the space. To fix the problem, you can specify the JAVA_HOME variable like this: - 

set JAVA_HOME=c:\Progra~1\Java\<jdkdir>
-
+ 
set JAVA_HOME=c:\Progra~1\Java\<jdkdir>
- The easiest solution, however, is to install JDK in a non-space directory, for example: +

The easiest solution, however, is to install JDK in a non-space directory, for example:

c:\java\jdk1.6.0_02
diff --git a/docs/html/guide/developing/building/building-eclipse.jd b/docs/html/guide/developing/building/building-eclipse.jd index 2c610c141cbca..11b9fec5dc5ba 100644 --- a/docs/html/guide/developing/building/building-eclipse.jd +++ b/docs/html/guide/developing/building/building-eclipse.jd @@ -1,4 +1,4 @@ -page.title=Building and Running Apps in Eclipse +page.title=Building and Running from Eclipse @jd:body
@@ -88,7 +88,7 @@ page.title=Building and Running Apps in Eclipse
  • Ensure that your development computer can detect your device when connected via USB
    • -

    Read Connecting Hardware Devices +

    Read Using Hardware Devices for more information.

    Once set up and your device is connected via USB, install your application on the device by diff --git a/docs/html/guide/developing/building/index.jd b/docs/html/guide/developing/building/index.jd index 25a6e2317e178..59c46452a70d0 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 Apps +page.title=Building and Running @jd:body

    @@ -49,7 +49,7 @@ page.title=Building and Running Apps tools and processes are masked from you. The following diagram depicts the different tools and processes that are involved in a build:

    -

    +

    The general process for a typical build is outlined below:

    diff --git a/docs/html/guide/developing/debugging/debugging-devtools.jd b/docs/html/guide/developing/debugging/debugging-devtools.jd index 88e6005c00c97..67605aee530ea 100644 --- a/docs/html/guide/developing/debugging/debugging-devtools.jd +++ b/docs/html/guide/developing/debugging/debugging-devtools.jd @@ -59,8 +59,9 @@ adb -d install Development.apk android.app.Activity#onSaveInstanceState} / {@link android.app.Activity#onCreate(android.os.Bundle)} code path, which would otherwise be difficult to force. Choosing this option will probably reveal a number of problems in your application - due to not saving state. For more information about saving an application's state, see - Handling Runtime Changes. + due to not saving state. For more information about saving an activity's state, see the + Activities +document.
    Show CPU usage
    diff --git a/docs/html/guide/developing/debugging/debugging-log.jd b/docs/html/guide/developing/debugging/debugging-log.jd index 6ee69c77316cc..ff73c177237dc 100644 --- a/docs/html/guide/developing/debugging/debugging-log.jd +++ b/docs/html/guide/developing/debugging/debugging-log.jd @@ -1,4 +1,4 @@ -page.title=Reading and Writing Log Messages +page.title=Reading and Writing Logs @jd:body
    diff --git a/docs/html/guide/developing/debugging/debugging-projects-cmdline.jd b/docs/html/guide/developing/debugging/debugging-projects-cmdline.jd index 72bb16dd4c6c6..6800a5da5de3a 100644 --- a/docs/html/guide/developing/debugging/debugging-projects-cmdline.jd +++ b/docs/html/guide/developing/debugging/debugging-projects-cmdline.jd @@ -1,4 +1,4 @@ -page.title=Debugging in other IDEs +page.title=Debugging from other IDEs @jd:body diff --git a/docs/html/guide/developing/debugging/debugging-projects.jd b/docs/html/guide/developing/debugging/debugging-projects.jd index 0e14999e24ea3..deb43412094f7 100644 --- a/docs/html/guide/developing/debugging/debugging-projects.jd +++ b/docs/html/guide/developing/debugging/debugging-projects.jd @@ -1,4 +1,4 @@ -page.title=Debugging in Eclipse +page.title=Debugging from Eclipse with ADT @jd:body
    diff --git a/docs/html/guide/developing/device.jd b/docs/html/guide/developing/device.jd index 657f5495c991e..abfae5d849e0b 100644 --- a/docs/html/guide/developing/device.jd +++ b/docs/html/guide/developing/device.jd @@ -1,4 +1,4 @@ -page.title=Connecting Hardware Devices +page.title=Using Hardware Devices @jd:body
    @@ -15,10 +15,6 @@ page.title=Connecting Hardware Devices
    1. Google USB Driver
    2. OEM USB Drivers
      3. -
    3. Developing in Eclipse, with ADT
      4. -
    4. Developing in other IDEs
    diff --git a/docs/html/guide/developing/devices/emulator.jd b/docs/html/guide/developing/devices/emulator.jd index 53c140754aaaf..f61a4372efb06 100644 --- a/docs/html/guide/developing/devices/emulator.jd +++ b/docs/html/guide/developing/devices/emulator.jd @@ -121,7 +121,7 @@ the emulator stores the user data, SD card data, and cache in the AVD directory.

    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.

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

    @@ -352,7 +352,7 @@ 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 Creating and Managing + information, see Managing Virtual Devices with AVD Manager. Disk Images @@ -708,7 +708,7 @@ 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 Creating and Managing Virtual Devices +href="{@docRoot}guide/developing/devices/managing-avds.html">Managing Virtual Devices with AVD Manager. @@ -884,7 +884,8 @@ 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 Creating and Managing Virtual Devices with AVD Manager. +href="{@docRoot}guide/developing/devices/managing-avds.html">Managing Virtual Devices with AVD +Manager.

    Temporary Images

    @@ -1635,7 +1636,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 Creating and Managing Virtual Devices.

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

    @@ -1699,7 +1700,8 @@ 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 Creating and Managing Virtual Devices on the Command Line. +href="{@docRoot}guide/developing/devices/managing-avds-cmdline.html">Managing Virtual Devices +from the Command Line.

    Creating an SD card image using mksdcard

    diff --git a/docs/html/guide/developing/devices/index.jd b/docs/html/guide/developing/devices/index.jd index 3e73eb01db679..a7d00f331bc96 100644 --- a/docs/html/guide/developing/devices/index.jd +++ b/docs/html/guide/developing/devices/index.jd @@ -1,4 +1,4 @@ -page.title=Creating and Managing Virtual Devices +page.title=Managing Virtual Devices @jd:body @@ -13,8 +13,8 @@ page.title=Creating and Managing Virtual Devices

    You can also create AVDs on the command line by passing the android tool options. For more information on how to create AVDs in this manner, see Creating and Managing Virtual - Devices on the Command Line.

    + "{@docRoot}guide/developing/devices/managing-avds-cmdline.html">Managing Virtual + Devices from the Command Line.

    An AVD consists of:

    @@ -66,10 +66,10 @@ page.title=Creating and Managing Virtual Devices

    To learn how to manage AVDs using a graphical tool, read - Creating and Managing AVDs with AVD Manager. To learn how to manage AVDs on the command line, read - Creating and Managing AVDs - on the Command Line.

    + "{@docRoot}guide/developing/devices/managing-avds.html">Managing AVDs with AVD Manager. To +learn how to manage AVDs on the command line, read + Managing AVDs + from the Command Line.

    diff --git a/docs/html/guide/developing/devices/managing-avds-cmdline.jd b/docs/html/guide/developing/devices/managing-avds-cmdline.jd index 878ccc9a86c21..02fd7503d08da 100644 --- a/docs/html/guide/developing/devices/managing-avds-cmdline.jd +++ b/docs/html/guide/developing/devices/managing-avds-cmdline.jd @@ -1,4 +1,4 @@ -page.title=Creating and Managing AVDs on the Command Line +page.title=Managing AVDs from the Command Line @jd:body
    diff --git a/docs/html/guide/developing/devices/managing-avds.jd b/docs/html/guide/developing/devices/managing-avds.jd index 27d2b559e9617..2913ac9eacea5 100644 --- a/docs/html/guide/developing/devices/managing-avds.jd +++ b/docs/html/guide/developing/devices/managing-avds.jd @@ -1,4 +1,4 @@ -page.title=Creating and Managing AVDs with AVD Manager +page.title=Managing AVDs with AVD Manager @jd:body
    diff --git a/docs/html/guide/developing/index.jd b/docs/html/guide/developing/index.jd index f19f97e9ca681..3a64dbc79b139 100644 --- a/docs/html/guide/developing/index.jd +++ b/docs/html/guide/developing/index.jd @@ -1,4 +1,4 @@ -page.title=Overview +page.title=Introduction @jd:body

    Developing applications for Android devices is facilitated by a group of tools that are @@ -28,8 +28,9 @@ page.title=Overview

    You need to create Android Virtual Devices (AVD) or connect hardware devices on which you will install your applications.

    -

    See Creating and Managing Virtual Devices - and Connecting Hardware Devices for more information. +

    See Managing Virtual Devices + and Using Hardware Devices for more +information.

  • diff --git a/docs/html/guide/developing/projects/index.jd b/docs/html/guide/developing/projects/index.jd index 609a71a182e53..e27fcb43252e1 100644 --- a/docs/html/guide/developing/projects/index.jd +++ b/docs/html/guide/developing/projects/index.jd @@ -1,4 +1,4 @@ -page.title=Creating and Managing Projects +page.title=Managing Projects @jd:body
    diff --git a/docs/html/guide/developing/projects/projects-cmdline.jd b/docs/html/guide/developing/projects/projects-cmdline.jd index 8b889ab871506..b12864efd36f0 100644 --- a/docs/html/guide/developing/projects/projects-cmdline.jd +++ b/docs/html/guide/developing/projects/projects-cmdline.jd @@ -1,4 +1,4 @@ -page.title=Creating and Managing Projects on the Command Line +page.title=Managing Projects from the Command Line @jd:body
    @@ -21,7 +21,7 @@ page.title=Creating and Managing Projects on the Command Line
    1. Testing - in Other IDEs
      2. + from Other IDEs
    @@ -41,7 +41,7 @@ page.title=Creating and Managing Projects on the Command Line
  • Test projects extend JUnit test functionality to include Android specific functionality. For more information on creating a test project, see Testing in other IDEs.
    • + "{@docRoot}guide/developing/testing/testing_otheride.html">Testing from other IDEs. @@ -279,7 +279,7 @@ android.library.reference.1=path/to/library_projectC

    To build an application project that depends on one or more library projects, you can use the standard Ant build commands and compile modes, as described in Building Your Application, earlier in this - document. The tools compile and merge all libraries referenced by the application as part of + "{@docRoot}guide/developing/building/index.html">Building and Running. The tools +compile and merge all libraries referenced by the application as part of compiling the dependent application project. No additional commands or steps are necessary.

    diff --git a/docs/html/guide/developing/projects/projects-eclipse.jd b/docs/html/guide/developing/projects/projects-eclipse.jd index 949e6f7accc3e..6070dc06a6496 100644 --- a/docs/html/guide/developing/projects/projects-eclipse.jd +++ b/docs/html/guide/developing/projects/projects-eclipse.jd @@ -1,4 +1,4 @@ -page.title=Creating and Managing Projects in Eclipse +page.title=Managing Projects from Eclipse @jd:body
    @@ -18,7 +18,7 @@ page.title=Creating and Managing Projects in Eclipse
    1. Testing - in Eclipse, with ADT
      2. + from Eclipse with ADT
    @@ -37,7 +37,7 @@ page.title=Creating and Managing Projects in Eclipse
  • Test projects extend JUnit test functionality to include Android specific functionality. For more information on creating a test project, see Testing in Eclipse
    • + "{@docRoot}guide/developing/testing/testing_eclipse.html">Testing from Eclipse with ADT.

    Creating an Android Project

    diff --git a/docs/html/guide/developing/testing/testing_eclipse.jd b/docs/html/guide/developing/testing/testing_eclipse.jd index 1b9c6b1bb4ffb..2a5b7713a6c8e 100644 --- a/docs/html/guide/developing/testing/testing_eclipse.jd +++ b/docs/html/guide/developing/testing/testing_eclipse.jd @@ -1,4 +1,4 @@ -page.title=Testing In Eclipse, with ADT +page.title=Testing from Eclipse with ADT @jd:body
    @@ -14,8 +14,10 @@ page.title=Testing In Eclipse, with ADT This topic explains how create and run tests of Android applications in Eclipse with ADT. Before you read this topic, you should read about how to create an Android application with the basic processes for creating and running applications with ADT, as described in - Creating and Managing Projects in Eclipse - and Building and Running Apps in Eclipse. + Managing Projects from +Eclipse + and Building and Running from +Eclipse. You may also want to read Testing Fundamentals, which provides an overview of the Android testing framework. @@ -48,7 +50,7 @@ page.title=Testing In Eclipse, with ADT

    If you are not developing in Eclipse or you want to learn how to create and run tests from the command line, see - Testing in Other IDEs. + Testing from Other IDEs.

    Creating a Test Project

    diff --git a/docs/html/guide/developing/testing/testing_otheride.jd b/docs/html/guide/developing/testing/testing_otheride.jd index 48fa032c69cef..50cc4fa0fab87 100644 --- a/docs/html/guide/developing/testing/testing_otheride.jd +++ b/docs/html/guide/developing/testing/testing_otheride.jd @@ -1,4 +1,4 @@ -page.title=Testing In Other IDEs +page.title=Testing from Other IDEs @jd:body

    @@ -67,7 +67,7 @@ page.title=Testing In Other IDEs If you are developing in Eclipse with ADT, you can set up and run your tests directly in Eclipse. For more information, please read - Testing in Eclipse, with ADT. + Testing from Eclipse with ADT.

    Working with Test Projects

    @@ -133,7 +133,7 @@ android create test-project -m <main_path> -n <project_name> -p < This creates a new test project with the appropriate directories and build files. The directory structure and build file contents are identical to those in a regular Android application project. They are described in detail in the topic - Creating and Managing Projects. + Managing Projects.

    The operation also creates an AndroidManifest.xml file with instrumentation diff --git a/docs/html/guide/developing/tools/adb.jd b/docs/html/guide/developing/tools/adb.jd index bcdc2e612758f..26839a180bc79 100644 --- a/docs/html/guide/developing/tools/adb.jd +++ b/docs/html/guide/developing/tools/adb.jd @@ -171,7 +171,8 @@ 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 Building and Running Apps

    +

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

    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.

    diff --git a/docs/html/guide/developing/tools/android.jd b/docs/html/guide/developing/tools/android.jd index ebf95ce693743..15cf8e0cf472b 100644 --- a/docs/html/guide/developing/tools/android.jd +++ b/docs/html/guide/developing/tools/android.jd @@ -5,11 +5,11 @@ page.title=android