diff --git a/docs/html/images/sdk_manager_packages.png b/docs/html/images/sdk_manager_packages.png index 463be8f387496..027cce76c6feb 100755 Binary files a/docs/html/images/sdk_manager_packages.png and b/docs/html/images/sdk_manager_packages.png differ diff --git a/docs/html/sdk/adding-components.jd b/docs/html/sdk/adding-components.jd index 1f9cb31af13ca..d2e55d8e536a0 100644 --- a/docs/html/sdk/adding-components.jd +++ b/docs/html/sdk/adding-components.jd @@ -98,20 +98,20 @@ complete.

This will reveal all of the components that are currently available for download from the SDK repository.
  • Select the component(s) you'd like to install and click Install - Selected. If you aren't sure which packages to select, read Recommended Components.
    • -
  • Verify and accept the components you want and click Install - Accepted. The components will now be installed into your existing - Android SDK directories.
    • + Selected. (If you aren't sure which packages to select, read Recommended Components.) +
  • Verify and accept the components you want (ensure each one is selected with a green +checkmark) and click Install. The components will now be installed into +your existing Android SDK directories.

    • New platforms are automatically saved into the -<sdk>/platforms/ directory of your SDK; -new add-ons are saved in the <sdk>/add-ons/ +<sdk>/platforms/ directory of your SDK; +new add-ons are saved in the <sdk>/add-ons/ directory; samples are saved in the -<sdk>/samples/android-<level>/; +<sdk>/samples/android-<level>/; and new documentation is saved in the existing -<sdk>/docs/ directory (old docs are replaced).

    +<sdk>/docs/ directory (old docs are replaced).

    Updating SDK Components

    @@ -167,15 +167,15 @@ components that are needed by those you have selected.

    Adding New Sites

    -

    By default, Available Packages only shows the default -repository site, which offers platforms, SDK tools, documentation, the -Google APIs Add-on, and other components. You can add other sites that host +

    By default, Available Packages displays components available from the +Android Repository and Third party Add-ons. You can add other sites that host their own Android SDK add-ons, then download the SDK add-ons from those sites.

    For example, a mobile carrier or device manufacturer might offer additional API libraries that are supported by their own Android-powered devices. In order -to develop using their libraries, you must install their Android SDK add-on.

    +to develop using their libraries, you must install their Android SDK add-on, if it's not already +available under Third party Add-ons.

    If a carrier or device manufacturer has hosted an SDK add-on repository file on their web site, follow these steps to add their site to the SDK and AVD @@ -183,11 +183,12 @@ Manager:

    1. Select Available Packages in the left panel.
      2. -
    2. Click Add Site and enter the URL of the +
    3. Click Add Add-on Site and enter the URL of the {@code repository.xml} file. Click OK.
    -

    Any SDK components available from the site will now be listed under -Available Packages.

    +

    Any SDK components available from the site will now be listed under a new item named +User Add-ons.

    +

    Troubleshooting

    diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd index 3dda5ee9b7cab..8b77303ecf4fb 100644 --- a/docs/html/sdk/index.jd +++ b/docs/html/sdk/index.jd @@ -23,7 +23,8 @@ sdk.linux_checksum=TODO
    1. Prepare your development computer and ensure it meets the system requirements.
      2. -
    2. Install the SDK starter package from the table above.
      3. +
    3. Install the SDK starter package from the table above. (If you're on Windows, download the +installer for help with the initial setup.)
    4. Install the ADT Plugin for Eclipse (if you'll be developing in Eclipse).
    5. Add Android platforms and other components to your SDK.
    6. Explore the contents of the Android SDK (optional).
      7. diff --git a/docs/html/sdk/installing.jd b/docs/html/sdk/installing.jd index 2f1918124aafa..4cb1bb22f11d0 100644 --- a/docs/html/sdk/installing.jd +++ b/docs/html/sdk/installing.jd @@ -56,6 +56,7 @@ function toggleDiv(link) {
    7. 3. Installing the ADT Plugin for Eclipse
    8. 4. Adding Platforms and Other Components
        +
      1. Available Components
      2. Recommended Components
    9. 5. Exploring the SDK (Optional)
      10. @@ -119,52 +120,14 @@ href="{@docRoot}sdk/index.html">SDK download page.

      it to a safe location on your machine. By default, the SDK files are unpacked into a directory named android-sdk-<machine-platform>.

      -

      Make a note of the name and -location of the unpacked SDK directory on your system—you will need to +

      If you downloaded the Windows installer ({@code .exe} file), run it now and it will check +whether the proper Java SE Development Kit (JDK) is installed (installing it, if necessary), then +install the SDK Tools into a default location (which you can modify).

      + +

      Make a note of the name and location of the SDK directory on your system—you will need to refer to the SDK directory later, when setting up the ADT plugin and when using the SDK tools from command line.

      -

      Optionally, you might want to add the location of the SDK's -tools/ directory and {@code platform-tools/} directory to your system -PATH. Both tool directories are located at the root of the SDK folder. - - -

      - - - How to update your PATH -
      - -

      Adding -tools/ and {@code platform-tools/} to your path lets you run Android Debug Bridge (adb) -and the other command line tools without needing to -supply the full path to the tool directories.

      - -
        -
      • On Linux, edit your ~/.bash_profile or ~/.bashrc file. Look - for a line that sets the PATH environment variable and add the - full path to the tools/ and {@code platform-tools/} directories to it. If you don't - see a line setting the path, you can add one: - - 
        export PATH=${PATH}:<your_sdk_dir>/tools:<your_sdk_dir>/platform-tools
        -
        • - -
      • On a Mac OS X, look in your home directory for .bash_profile and - proceed as for Linux. You can create the .bash_profile if - you haven't already set one up on your machine.
        • - -
      • On Windows, right-click on My Computer, and select Properties. - Under the Advanced tab, hit the Environment Variables button, and in the - dialog that comes up, double-click on Path (under System Variables). Add the full path to the - tools/ and {@code platform-tools/} directories to the path.
        • -
      - -
      -
      - -

      Step 3. Installing the ADT Plugin for Eclipse

      @@ -204,28 +167,40 @@ application, you also need to download at least one Android platform and the SDK (tools that the latest platform depend upon). However, downloading additional components is highly recommended.

      +

      If you used the Windows installer, when you complete the installation wizard, it will launch the +Android SDK and AVD Manager with a default set of platforms and other components selected +for you to install. Simply click Install to accept the recommended set of +components and install them. You can then skip to Step 5, but we +recommend you first read the section about the Available Components to +better understand the components available from the Android SDK and AVD Manager.

      +

      You can launch the Android SDK and AVD Manager in one of the following ways:

      To download components, use the graphical UI of the Android SDK and AVD Manager, shown in Figure 1, to browse the SDK repository and select new or updated components. The Android SDK and AVD Manager will install the selected components in your SDK environment. For information about which components you should download, see the following -section about Recommended Components

      +section about Recommended Components.

      Figure 1. The Android SDK and AVD Manager's Available Packages panel, which shows the SDK components that are available for you to download into your environment.

      -

      The SDK repository offers these types of components:

      + +

      Available Components

      + +

      By default, there are two repositories of components for your SDK: Android +Repository and Third party Add-ons.

      + +

      The Android Repository offers these types of components:

      +

      The Third party Add-ons provide components that allow you to create a development +environment using a specific Android external library (such as the Google Maps library) or a +customized (but fully compliant) Android system image. You can add additional Add-on repositories, +by clicking Add Add-on Site.

      +

      Recommended Components

      @@ -496,6 +470,47 @@ documentation. + +

      Optionally, you might want to add the location of the SDK's tools/ and +platform-tools to your PATH environment variable, to provide easy +access to the tools.

      + + +
      + + + How to update your PATH +
      + +

      Adding both tools/ and platform-tools/ to your PATH lets you run +command line tools without needing to +supply the full path to the tool directories. Depending on your operating system, you can +include these directories in your PATH in the following way:

      + +
        + +
      • On Windows, right-click on My Computer, and select Properties. + Under the Advanced tab, hit the Environment Variables button, and in the + dialog that comes up, double-click on Path (under System Variables). Add the full path to the + tools/ and platform-tools/ directories to the path.
        • + +
      • On Linux, edit your ~/.bash_profile or ~/.bashrc file. Look + for a line that sets the PATH environment variable and add the + full path to the tools/ and platform-tools directories to it. If you + don't see a line setting the path, you can add one: + 
        export PATH=${PATH}:<sdk>/tools:<sdk>/platform-tools
        +
        • + +
      • On a Mac OS X, look in your home directory for .bash_profile and + proceed as for Linux. You can create the .bash_profile if + you don't already have one.
        • +
      + +
      +
      + +

      Next Steps

      Once you have completed installation, you are ready to begin developing applications. Here are a few ways you can get started: