From c74a69a89a0f65bca87520928a714ed20c45873d Mon Sep 17 00:00:00 2001 From: Robert Ly Date: Tue, 4 Jan 2011 22:48:02 -0800 Subject: [PATCH] Doc Change: Fixing broken links and miscellaneous text revisions to support link fixing Change-Id: I192595a3c7af520bf8598e80ae25d0dea289fcbd --- .../developing/building/building-cmdline.jd | 2 +- .../guide/developing/devices/managing-avds.jd | 8 +- docs/html/guide/developing/index.jd | 19 ++--- docs/html/guide/developing/projects/index.jd | 81 ++++++++++++++++++- .../developing/testing/testing_eclipse.jd | 5 +- .../developing/testing/testing_otheride.jd | 2 +- docs/html/guide/guide_toc.cs | 14 ++-- docs/html/guide/publishing/app-signing.jd | 8 +- docs/html/guide/publishing/licensing.jd | 30 +++---- docs/html/guide/tutorials/hello-world.jd | 13 +-- .../articles/backward-compatibility.jd | 4 +- .../resources/articles/layout-tricks-merge.jd | 2 +- docs/html/resources/faq/commontasks.jd | 2 +- docs/html/resources/faq/troubleshooting.jd | 10 ++- .../tutorials/testing/activity_test.jd | 5 +- docs/html/sdk/eclipse-adt.jd | 5 +- docs/html/sdk/installing.jd | 11 +-- docs/html/sdk/ndk/overview.jd | 13 +-- docs/html/sdk/tools-notes.jd | 5 +- 19 files changed, 163 insertions(+), 76 deletions(-) diff --git a/docs/html/guide/developing/building/building-cmdline.jd b/docs/html/guide/developing/building/building-cmdline.jd index 934e936dc8164..f40ad045414e8 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 in Other IDEs +page.title=Building and Running Apps on 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 73a6b6c67cdaf..27d2b559e9617 100644 --- a/docs/html/guide/developing/devices/managing-avds.jd +++ b/docs/html/guide/developing/devices/managing-avds.jd @@ -6,7 +6,11 @@ page.title=Creating and Managing AVDs with AVD Manager

In this document

    -
  1. Creating an AVD
    2. +
  2. Creating an AVD +
      +
    1. Hardware options
      2. +
    +
@@ -25,7 +29,7 @@ page.title=Creating and Managing AVDs with AVD Manager of each AVD.

-

Creating an AVD

+

Creating an AVD

You can create as many AVDs as you would like to test on. It is recommended that you test your applications on all API levels higher than the target API level for your application.

diff --git a/docs/html/guide/developing/index.jd b/docs/html/guide/developing/index.jd index 879986c7c7fd5..f19f97e9ca681 100644 --- a/docs/html/guide/developing/index.jd +++ b/docs/html/guide/developing/index.jd @@ -23,32 +23,33 @@ page.title=Overview before continuing.

-
  • - Set up Android Virtual Devices - or hardware devices. +
  • Set up Android Virtual Devices or hardware devices.

    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.

  • - Create an Android project. + Create an Android project.

    An Android project contains all source code and resource files for your application. It is built into an .apk package that you can install on Android devices.

  • - Build and run your + Build and run your application.

    If you are using Eclipse, builds are generated each time you save changes and you can install your application on a device by clicking Run. If you're using another IDE, you can build your - project using Ant and install it on a device using ADB.

    + project using Ant and install it on a device using adb.

  • - Debug your application with the + Debug your application with the SDK debugging and logging tools.

    Debugging your application involves using a JDWP-compliant debugger along with the @@ -110,6 +111,6 @@ page.title=Overview Eclipse, such as the adb shell commands. You might also need to call Keytool and Jarsigner to sign your applications, but you can set up Eclipse to do this automatically as well.

    -

    For more information on these tools, see the - Tools section of the documentation.

    +

    For more information on the tools provided with the Android SDK, see the + Tools section of the documentation.

    diff --git a/docs/html/guide/developing/projects/index.jd b/docs/html/guide/developing/projects/index.jd index 1daf73864986f..45fd5a1c90d3e 100644 --- a/docs/html/guide/developing/projects/index.jd +++ b/docs/html/guide/developing/projects/index.jd @@ -8,7 +8,11 @@ page.title=Creating and Managing Projects
    1. Android Projects
      2. -
    2. Library Projects
      3. +
    3. Library Projects +
        +
      1. Migrating library projects to ADT 0.9.8 or higher
        2. +
      +
    4. Test Projects
    @@ -418,6 +422,81 @@ page.title=Creating and Managing Projects project can reference the library project through a relative link.

    • + + +

    Migrating library projects to ADT 0.9.8 or higher

    + +

    This section provides information about how to migrate a library project +created with ADT 0.9.7 to ADT 0.9.8 or higher. The migration is needed only if +you are developing in Eclipse with ADT and assumes that you have also upgraded +to SDK Tools r7 (or higher).

    + +

    The way that ADT handles library projects has changed between +ADT 0.9.7 and ADT 0.9.8. Specifically, in ADT 0.9.7, the src/ +source folder of the library was linked into the dependent application project +as a folder that had the same name as the library project. This worked because +of two restrictions on the library projects:

    + + + +

    In ADT 0.9.8, both of those restrictions were removed. A library project can +have as many source folders as needed and each can have any name. Additionally, +a library project can store source folders in any location of the project. For +example, you could store sources in a src/java/ directory. In order +to support this, the name of the linked source folders in the main project are +now called <library-name>_<folder-name> For +example: MyLibrary_src/ or MyLibrary_src_java/.

    + +

    Additionally, the linking process now flags those folders in order for ADT to +recognize that it created them. This will allow ADT to automatically migrate the +project to new versions of ADT, should they contain changes to the handling of +library projects. ADT 0.9.7 did not flag the linked source folders, so ADT 0.9.8 +cannot be sure whether the old linked folders can be removed safely. After +upgrading ADT to 0.9.8, you will need to remove the old linked folders manually +in a simple two-step process, as described below.

    + +

    Before you begin, make sure to create a backup copy of your application or +save the latest version to your code version control system. This ensures that +you will be able to easily revert the migration changes in case there is a +problem in your environment.

    + +

    When you first upgrade to ADT 0.9.8, your main project will look as shown +in figure 1, with two linked folders (in this example, MyLibrary and +MyLibrary_src — both of which link to +MyLibrary/src. Eclipse shows an error on one of them because they +are duplicate links to a single class.

    + + +

    Figure 1. Library project migration error

    +

    To fix the error, remove the linked folder that does not contain the +_src suffix.

    + +
      +
    1. Right click the folder that you want to remove (in this case, the +MyLibrary folder) and choose Build Path > +Remove from Build Path, as shown in figure 2.
      2. + + +

      Figure 2. Remove from Build Path menu item

      + +
    2. Next, when asked about unlinking the folder from the project, select +Yes, as shown in figure 3.
      3. + + + +

      Figure 3. Unlink folder confirmation window

      +
    + +

    This should resolve the error and migrate your library project to the new +ADT environment.

    + +

    Test Projects

    diff --git a/docs/html/guide/developing/testing/testing_eclipse.jd b/docs/html/guide/developing/testing/testing_eclipse.jd index 370c1426069e7..1b9c6b1bb4ffb 100644 --- a/docs/html/guide/developing/testing/testing_eclipse.jd +++ b/docs/html/guide/developing/testing/testing_eclipse.jd @@ -12,9 +12,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 a Android application with the + 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 - Developing In Eclipse, with ADT. + Creating and Managing Projects in Eclipse + and Building and Running Apps in Eclipse. You may also want to read Testing Fundamentals, which provides an overview of the Android testing framework. diff --git a/docs/html/guide/developing/testing/testing_otheride.jd b/docs/html/guide/developing/testing/testing_otheride.jd index adb0efac8a37f..48fa032c69cef 100644 --- a/docs/html/guide/developing/testing/testing_otheride.jd +++ b/docs/html/guide/developing/testing/testing_otheride.jd @@ -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 - Developing In Other IDEs. + Creating and Managing Projects.

    The operation also creates an AndroidManifest.xml file with instrumentation diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs index 401337a818d44..a984acd18d396 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -311,7 +311,7 @@

  • - + Overview
    • @@ -354,7 +354,7 @@