diff --git a/docs/html/guide/appendix/api-levels.jd b/docs/html/guide/appendix/api-levels.jd index cc98f8fe8df7b..bc7d83b6db1b1 100644 --- a/docs/html/guide/appendix/api-levels.jd +++ b/docs/html/guide/appendix/api-levels.jd @@ -350,11 +350,11 @@ including the latest version, and provides an updater tool that you can use to download other platform versions as necessary.

To access the updater, use the android command-line tool, -located in the <sdk>/tools directory. You can launch the Updater by using -the android command without specifying any options. You can +located in the <sdk>/tools directory. You can launch the SDK updater by +executing android sdk. You can also simply double-click the android.bat (Windows) or android (OS X/Linux) file. In ADT, you can also access the updater by selecting -Window > Android SDK and AVD +Window > Android SDK Manager.

To run your application against different platform versions in the emulator, diff --git a/docs/html/guide/developing/building/building-cmdline.jd b/docs/html/guide/developing/building/building-cmdline.jd index c43962a81a28c..fd90b1a5a7f14 100644 --- a/docs/html/guide/developing/building/building-cmdline.jd +++ b/docs/html/guide/developing/building/building-cmdline.jd @@ -202,12 +202,12 @@ ant release

  1. - Open the SDK and AVD Manager and launch a virtual device + Open the AVD Manager and launch a virtual device -

    From your SDK's platform-tools/ directory, execute the {@code android} tool with no - arguments:

    +

    From your SDK's platform-tools/ directory, execute the {@code android} tool +with the avd options:

    -android
+android avd

    In the Virtual Devices view, select an AVD and click Start.

    @@ -237,7 +237,7 @@ adb -s emulator-5554 install path/to/your/app.apk

If you don't see your application on the emulator, try closing the emulator and launching the - virtual device again from the SDK and AVD Manager. Sometimes when you install an application for the + virtual device again from the AVD Manager. Sometimes when you install an application for the first time, it won't show up in the application launcher or be accessible by other applications. This is because the package manager usually examines manifests completely only on emulator startup.

diff --git a/docs/html/guide/developing/devices/index.jd b/docs/html/guide/developing/devices/index.jd index a7d00f331bc96..64651a1ec9074 100644 --- a/docs/html/guide/developing/devices/index.jd +++ b/docs/html/guide/developing/devices/index.jd @@ -7,9 +7,9 @@ page.title=Managing Virtual Devices

The easiest way to create an AVD is to use the graphical AVD Manager, which you launch - from Eclipse by clicking Window > Android SDK and AVD Manager. You can also start - the AVD Manager from the command line by calling the android tool in the tools - directory of the Android SDK.

+ from Eclipse by clicking Window > AVD Manager. You can also start the AVD +Manager from the command line by calling the android tool with the avd +options, from the <sdk>/tools/ directory.

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 Start the AVD Manager:

If you are using Eclipse, the android tool's features are integrated into ADT, so you should not need to use this tool directly. + +

Note: The documentation of options below is not exhaustive +and may be out of date. For the most current list of options, execute android +--help.

+ + +

Syntax

android [global options] action [action options]
@@ -51,6 +58,26 @@ Line. Comments + + avd + + None + + Launch the AVD Manager + + + + + + sdk + + None + + Launch the Android SDK Manager + + + + create avd diff --git a/docs/html/guide/developing/tools/index.jd b/docs/html/guide/developing/tools/index.jd index 3d831f3e390cb..5e9f686241462 100644 --- a/docs/html/guide/developing/tools/index.jd +++ b/docs/html/guide/developing/tools/index.jd @@ -12,8 +12,8 @@ latest Android platform.

SDK Tools

The SDK tools are installed with the SDK starter package and are periodically updated. The SDK tools are required if you are developing Android applications. The most important SDK tools -include the Android SDK and AVD Manager (android), the emulator -(emulator), and the Dalvik Debug Monitor Server +include the Android SDK Manager (android sdk), the AVD Manager (android +avd) the emulator (emulator), and the Dalvik Debug Monitor Server (ddms). A short summary of some frequently-used SDK tools is provided below.

diff --git a/docs/html/guide/market/billing/billing_integrate.jd b/docs/html/guide/market/billing/billing_integrate.jd index b49dc25d89937..4b3650fcc6d5b 100755 --- a/docs/html/guide/market/billing/billing_integrate.jd +++ b/docs/html/guide/market/billing/billing_integrate.jd @@ -149,8 +149,8 @@ relies on these utility classes.

The in-app billing sample application is available as a downloadable component of the Android -SDK. To download the sample application component, launch the Android SDK and AVD Manager and then -select the "Google Market Billing package" component (see figure 1), and click Install +SDK. To download the sample application component, launch the Android SDK Manager and then +select the Google Market Billing package component (see figure 1), and click Install Selected to begin the download.

@@ -160,7 +160,7 @@ Selected to begin the download.

the AIDL file.

-

When the download is complete, the Android SDK and AVD Manager saves the component into the +

When the download is complete, the Android SDK Manager saves the component into the following directory:

<sdk>/extras/google/market_billing/

diff --git a/docs/html/guide/market/licensing/overview.jd b/docs/html/guide/market/licensing/overview.jd index 05a3a409fa78a..e7e23f877dad7 100644 --- a/docs/html/guide/market/licensing/overview.jd +++ b/docs/html/guide/market/licensing/overview.jd @@ -58,8 +58,9 @@ information about the application and user—your application and the Google together to assemble the information and the Google Play client passes it to the server.

To help you add licensing to your application, the Android SDK provides a downloadable set of -library sources that you can include in your application project: the "Google Market Licensing -package." The License Verification Library (LVL) is a library you can add to your application that +library sources that you can include in your application project: the Google Market +Licensing package. The License Verification Library (LVL) is a library you can add to your +application that handles all of the licensing-related communication with the Google Play licensing service. With the LVL added to your application, your application can determine its licensing status for the current user by simply calling a method and implementing a callback that receives the status @@ -116,7 +117,7 @@ tampered with or that are spoofed.

Licensing Verification Library

-

The Android SDK provides a downloadable component called the "Google Market Licensing package," +

The Android SDK provides a downloadable package called the Google Market Licensing package, which includes the License Verification Library (LVL). The LVL greatly simplifies the process of adding licensing to your application and helps ensure a more secure, robust implementation for your application. The LVL provides internal classes that handle most of the standard operations of a @@ -162,8 +163,8 @@ does not cache any response data and allows the application access only when the server returns a licensed response.

-

The LVL is available as a downloadable component of the Android SDK. The -component includes both the LVL itself and an example application that shows how +

The LVL is available as a downloadable package of the Android SDK. The +package includes both the LVL itself and an example application that shows how the library should be integrated with your application and how your application should manage response data, UI interaction, and error conditions.

diff --git a/docs/html/guide/market/licensing/setting-up.jd b/docs/html/guide/market/licensing/setting-up.jd index 41e3bc49b7b58..0de7819b0108e 100644 --- a/docs/html/guide/market/licensing/setting-up.jd +++ b/docs/html/guide/market/licensing/setting-up.jd @@ -173,25 +173,25 @@ your application without having publish it. For more information see Signing in to an authorized account, below.

-

Several versions of the add-on are available through the SDK Manager, but only -Google APIs Add-On, API 8 (release 2) or higher includes the necessary Google +

Several versions of the Google APIs add-on are available through the SDK Manager, but only +the version for Android 2.2 and higher includes the necessary Google Play services.

To set up an emulator for adding licensing to an application, follow these steps:

    -
  1. Launch the Android SDK Manager.
    2. -
  2. In the Available Packages panel, select and download the -SDK component "Google APIs (Google Inc.) - API Level 8" (or higher) from the SDK -repository. -

    When the download is complete, use the Android SDK Manager to -create a new AVD based on that component, described next.

    3. -
  3. In the Virtual -Devices panel of the Android SDK Manager, click +
  4. Launch the Android SDK Manager (available under the Eclipse Window +menu or by executing {@code <sdk>/tools/android sdk}).
    5. +
  5. Select and download Google APIs for the Android version you'd like to target +(must be Android 2.2 or higher).
    6. +
  6. When the download is complete, open the AVD Manager (available under the Eclipse +Window +menu or by executing {@code <sdk>/tools/android avd}).
    7. +
  7. Click New and set the configuration details for the new AVD.
  8. In the dialog that appears, assign a descriptive name to the AVD and then -use the "Target" menu to choose the "Google APIs (Google Inc.) - API Level 8" as +use the Target menu to choose the Google APIs as the system image to run on the new AVD. Set the other configuration details as needed and then click Create AVD to finish. The SDK tools create the new AVD configuration, which then appears in the list of available @@ -238,8 +238,8 @@ greatly simplify the work that you need to do to add licensing to your application. In all cases, we recommend that you download the LVL and use it as the basis for the licensing implementation in your application.

    -

    The LVL is available as a downloadable component of the Android SDK. The -component includes:

    +

    The LVL is available as a downloadable package of the Android SDK. The +package includes:

    • The LVL sources, stored inside an Android library project.
      • @@ -248,9 +248,9 @@ project. The example illustrates how an application uses the library helper classes to check and enforce licensing.
    -

    To download the LVL component into your development environment, use the +

    To download the LVL package into your development environment, use the Android SDK Manager. Launch the Android SDK Manager and then -select the "Google Market Licensing" component, as shown in figure 2. +select the Google Market Licensing package, as shown in figure 2. Accept the terms and click Install Selected to begin the download.

    @@ -265,8 +265,8 @@ the LVL library project and the example application into these directories:

    <sdk>/extras/google/market_licensing/sample/  (the example application)

    -

    If you aren't familiar with how to download components into your SDK, see the -Adding SDK Components +

    If you aren't familiar with how to download packess into your SDK, see the +Adding SDK Packages document.

    @@ -676,7 +676,7 @@ credentials.

    1. Open Settings > Accounts & sync
      2. -
    2. Select Add Account and choose to add a "Google" account. +
    3. Select Add Account and choose to add a Google account.
    4. Select Next and then Sign in.
    5. Enter the username and password of either the publisher account or a test diff --git a/docs/html/guide/practices/optimizing-for-3.0.jd b/docs/html/guide/practices/optimizing-for-3.0.jd index 140c50ca52f5e..d6c621ea4287e 100644 --- a/docs/html/guide/practices/optimizing-for-3.0.jd +++ b/docs/html/guide/practices/optimizing-for-3.0.jd @@ -108,7 +108,7 @@ SDK with the new platform:

      SDK starter package now.)

        -
      1. Launch the Android SDK and AVD +
      2. Launch the Android SDK Manager and install the following:
        • SDK Platform Android 3.0
          • @@ -147,7 +147,7 @@ Android 3.0, the emulator is still best way to evaluate your application's appea functionality on Android 3.0.

          Tip: To improve the startup time for the emulator, enable snapshots -for the AVD when you create it with the SDK and AVD Manager (there's a checkbox in the AVD creator +for the AVD when you create it with the AVD Manager (there's a checkbox in the AVD creator to Enable snapshots). Then, start the AVD from the AVD manager and check Launch from snapshot and Save to snapshot. This way, when you close the emulator, a snapshot of the AVD state is saved and used to quickly relaunch the AVD next time. However, when you choose to @@ -281,7 +281,7 @@ to help you add features from Android 3.0 without requiring you to change your < href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code android:minSdkVersion} or build target, we're providing a static library called the Compatibility Library -(downloadable from the AVD and SDK Manager).

          +(downloadable from the Android SDK Manager).

          This library includes APIs for fragments, loaders, and some updated classes. By @@ -421,7 +421,7 @@ href="{@docRoot}sdk/android-3.0.html">Android 3.0 Platform document.

          href="{@docRoot}sdk/android-3.0.html#api">Android 3.0 Platform document also have accompanying samples that allow you to preview the effects and can help you understand how to use them. To get the samples, download them from the SDK repository using the Android SDK and AVD Manager. After downloading the samples ("Samples for SDK API +>using the Android SDK Manager. After downloading the samples ("Samples for SDK API 11"), you can find them in <sdk_root>/samples/android-11/. The following list provides links to the browsable source code for some of the samples:

          diff --git a/docs/html/guide/practices/screens_support.jd b/docs/html/guide/practices/screens_support.jd index 29dff261335e7..a870b223c6ac9 100644 --- a/docs/html/guide/practices/screens_support.jd +++ b/docs/html/guide/practices/screens_support.jd @@ -1242,12 +1242,12 @@ have to buy various devices just to test your application's screen support.

          To set up an environment for testing your application's screen support, you should create a series of AVDs (Android Virtual Devices), using emulator skins and screen configurations that emulate the screen sizes and densities you want your application to support. To do so, you can use -the Android SDK and AVD Manager to create the AVDs and launch them with a graphical interface.

          +the AVD Manager to create the AVDs and launch them with a graphical interface.

          -

          To launch the Android SDK and AVD Manager, execute the {@code +

          To launch the Android SDK Manager, execute the {@code SDK Manager.exe} from your Android SDK directory (on Windows only) or execute {@code android} from -the {@code <sdk>/tools/} directory (on all platforms). Figure 6 shows the Android SDK and -AVD Manager with a selection of AVDs, for testing various screen configurations.

          +the {@code <sdk>/tools/} directory (on all platforms). Figure 6 shows the AVD +Manager with a selection of AVDs, for testing various screen configurations.

          Table 3 shows the various emulator skins that are available in the Android SDK, which you can use to emulate some of the most common screen configurations.

          @@ -1340,7 +1340,7 @@ dashboard.

          Figure 7. - Size and density options you can set, when starting an AVD from the Android SDK and AVD + Size and density options you can set, when starting an AVD from the AVD Manager.

          @@ -1349,12 +1349,12 @@ up to run at a physical size that closely matches an actual device. This makes it a lot easier to compare the results at various sizes and densities. To do so you need to know the approximate density, in dpi, of your computer monitor (for instance, a 30" Dell monitor has a density of about 96 dpi). When you launch an AVD -from the Android SDK and AVD Manager, you can specify the screen size for the emulator and your +from the AVD Manager, you can specify the screen size for the emulator and your monitor dpi in the Launch Options, as shown in figure 7.

          If you would like to test your application on a screen that uses a resolution or density not supported by the built-in skins, you can create an AVD that uses a custom resolution -or density. When creating the AVD from the Android SDK and AVD Manager, specify the Resolution, +or density. When creating the AVD from the AVD Manager, specify the Resolution, instead of selecting a Built-in Skin.

          If you are launching your AVD from the command line, you can specify the scale for diff --git a/docs/html/guide/topics/location/index.jd b/docs/html/guide/topics/location/index.jd index 5f98902cf701f..8a2e9cdb2bae0 100644 --- a/docs/html/guide/topics/location/index.jd +++ b/docs/html/guide/topics/location/index.jd @@ -98,7 +98,7 @@ Google APIs add-on, visit

          href="http://code.google.com/android/add-ons/google-apis">http://code.google.com/android/add-ons/google-apis

          For your convenience, the Google APIs add-on is also available as a downloadable component from -the Android SDK and AVD Manager (see Adding SDK +the Android SDK Manager (see Adding SDK Components).

          Note: In order to display Google Maps data in a diff --git a/docs/html/guide/topics/manifest/uses-feature-element.jd b/docs/html/guide/topics/manifest/uses-feature-element.jd index 9175566cb36ed..5f0a501c36703 100644 --- a/docs/html/guide/topics/manifest/uses-feature-element.jd +++ b/docs/html/guide/topics/manifest/uses-feature-element.jd @@ -501,7 +501,7 @@ If you are using SDK Tools r8 or higher, you can find aapt in the

          Note: You must use the version of aapt that is provided for the latest Platform-Tools component available. If you do not have the latest Platform-Tools component, download it using the Android SDK and AVD Manager. +href="{@docRoot}sdk/adding-components.html">Android SDK Manager.

        • Run aapt using this syntax:
      diff --git a/docs/html/guide/tutorials/views/hello-mapview.jd b/docs/html/guide/tutorials/views/hello-mapview.jd index 458db4ff0e088..5217b6b20e9f5 100644 --- a/docs/html/guide/tutorials/views/hello-mapview.jd +++ b/docs/html/guide/tutorials/views/hello-mapview.jd @@ -14,8 +14,8 @@ location:

      href="http://code.google.com/android/add-ons/google-apis">http://code.google.com/android/add-ons/google-apis

      The Google APIs add-on requires Android 1.5 SDK or later release. After -installing the add-on in your SDK, set your project properties to use the build -target called "Google APIs Add-on". See the instructions for setting a build +installing the add-on in your SDK, set your project properties to use a Google +APIs build target. See the instructions for setting a build target in Developing in Eclipse with ADT or Developing in Other IDEs, diff --git a/docs/html/images/screens_support/avds-config.png b/docs/html/images/screens_support/avds-config.png index 3af1c395a1338..c7d534cdd4638 100644 Binary files a/docs/html/images/screens_support/avds-config.png and b/docs/html/images/screens_support/avds-config.png differ diff --git a/docs/html/offline.jd b/docs/html/offline.jd index 5f8e37ce91ad1..edd8eb09dd2d5 100644 --- a/docs/html/offline.jd +++ b/docs/html/offline.jd @@ -40,7 +40,7 @@ tools

      6. Follow the guide to Installing the Android SDK, which will help you setup your development environment.

      -

      If you've installed new SDK components using the SDK and AVD Manager

      +

      If you've installed new SDK components using the Android SDK Manager

      There's no additional setup.

      diff --git a/docs/html/resources/samples/get.jd b/docs/html/resources/samples/get.jd index 86ec836119ba0..751965ff5b992 100644 --- a/docs/html/resources/samples/get.jd +++ b/docs/html/resources/samples/get.jd @@ -26,15 +26,15 @@ needed!

      The SDK sample code is available to you as a set of downloadable SDK components, each of which contains the samples for a specific Android platform version. Once you have installed the SDK, you can download one or more samples -component(s) into your SDK environment using the Android SDK and AVD Manager +component(s) into your SDK environment using the Android SDK Manager tool, which is pre-installed in the SDK.

      -

      To download the samples, launch the Android SDK and AVD Manager tool and +

      To download the samples, launch the Android SDK Manager tool and select one of the samples components from the Available Packages panel, for example "Samples for SDK API 7". Select Install Selected, verify and accept the download, then select Install Accepted to download the component into your SDK. If -you aren't familiar with the Android SDK and AVD Manager and how to launch or +you aren't familiar with the Android SDK Manager and how to launch or use it, please read the Adding SDK Components document.

      @@ -74,7 +74,7 @@ From there you can read a short summary of each sample application and what types of concepts, features, or APIs it includes. Then, use the links provided to move through the directories and files of each sample. The browseable source is generated from the same source code that is downloadable through the Android -SDK and AVD Manager, as described above.

      +SDK Manager, as described above.

      The browseable samples files are available online, at the Android Developers site only and are not included in the downloadable offline documentation. diff --git a/docs/html/resources/tutorials/hello-world.jd b/docs/html/resources/tutorials/hello-world.jd index cc8cb3ebd6056..70ba06c002e46 100644 --- a/docs/html/resources/tutorials/hello-world.jd +++ b/docs/html/resources/tutorials/hello-world.jd @@ -42,7 +42,7 @@ you need to do it now.

        -
      1. In the Android SDK and AVD Manager, choose Available +
      2. In the Android SDK Manager, choose Available Packages in the left panel.
      3. In the right panel, expand the Android Repository list to display @@ -72,7 +72,7 @@ device settings used by the emulator.

        To create an AVD:

          -
        1. In Eclipse, select Window > Android SDK and AVD Manager.
          2. +
        2. In Eclipse, select Window > AVD Manager.
        3. Select Virtual Devices in the left panel.
        4. Click New.... diff --git a/docs/html/resources/tutorials/testing/activity_test.jd b/docs/html/resources/tutorials/testing/activity_test.jd index 4b861e286bbef..f88b7687be1a1 100644 --- a/docs/html/resources/tutorials/testing/activity_test.jd +++ b/docs/html/resources/tutorials/testing/activity_test.jd @@ -163,7 +163,7 @@ parent.link=../../browser.html?tag=tutorial open the Android SDK and AVD Manager and check in the Installed Packages panel. If aren't sure how to download a platform into your SDK, - read Adding SDK Components. + read Adding SDK Packages.

          5. diff --git a/docs/html/sdk/adding-components.jd b/docs/html/sdk/adding-components.jd index ca27bbad0a727..599b2a831f62c 100644 --- a/docs/html/sdk/adding-components.jd +++ b/docs/html/sdk/adding-components.jd @@ -1,4 +1,4 @@ -page.title=Adding SDK Components +page.title=Adding SDK Packages @jd:body @@ -6,74 +6,74 @@ page.title=Adding SDK Components

          Quickview

            -
          • Use the Android SDK and AVD Manager to +
          • Use the Android SDK Manager to set up your SDK and keep it up-to-date.

          In this document

            -
          1. Launching the Android SDK and AVD Manager -
          2. Installing SDK Components -
          3. Updating SDK Components -
          4. Component Dependencies
            5. +
          5. Launching the Android SDK Manager +
          6. Installing SDK Packages +
          7. Updating SDK Packages +
          8. Package Dependencies
          9. Adding New Sites
          10. Troubleshooting
          -

          Adding and updating components in your Android SDK is fast and easy. To add or -update the individual SDK components that you need, use the Android SDK and AVD +

          Adding and updating packages in your Android SDK is fast and easy. To add or +update the individual SDK packages that you need, use the Android SDK Manager (included in the SDK Tools).

          It only takes a couple of clicks to install individual versions of the Android platform, new development tools, new documentation, and SDK add-ons. The -new SDK components are automatically installed into your existing SDK directory, +new SDK packages are automatically installed into your existing SDK directory, so you don't need to update your development environment to specify a new SDK location.

          If you're setting up your Android SDK for the first time, see Installing the SDK for information about -what components to install.

          +what packages to install.

          Note: If you develop in Eclipse, you might also need to update your ADT plugin when you update your development tools. See the revisions listed in the ADT Plugin for Eclipse document.

          -

          Figure 1. The Android SDK and AVD Manager's -Available Packages panel, which shows the SDK components that are +

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

          -

          Launching the Android SDK and AVD Manager

          +

          Launching the Android SDK Manager

          -

          The Android SDK and AVD Manager is the tool that you use to install and -upgrade SDK components in your development environment.

          +

          The Android SDK Manager is the tool that you use to install and +upgrade SDK packages in your development environment.

          -

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

          +

          You can launch the Android SDK Manager in one of the following ways.

          Launching from Eclipse/ADT

          If you are developing in Eclipse and have already installed the ADT Plugin, -follow these steps to access the Android SDK and AVD Manager tool:

          +follow these steps to access the Android SDK Manager tool:

          1. Open Eclipse
            2. -
          2. Select Window > Android SDK and AVD +
          3. Select Window > Android SDK Manager.

          Launching from the SDK Manager script (Windows only)

          -

          For Windows only, the SDK includes a script that invokes the Android SDK and -AVD Manager. To launch the tool using the script, double-click {@code SDK +

          For Windows only, the SDK includes a script that invokes the Android SDK Manager. To launch the +tool using the script, double-click {@code SDK Manager.exe} at the root of the the SDK directory.

          Launching from a command line

          -

          In all development environments, follow these steps to access the Android SDK -and AVD Manager tool from the command line:

          +

          In all development environments, follow these steps to access the Android SDK Manager tool from +the command line:

          1. Navigate to the <sdk>/tools/ directory.
            2. @@ -82,26 +82,26 @@ and AVD Manager tool from the command line:

          -

          Installing SDK Components

          +

          Installing SDK Packages

          -

          Caution: Before you install SDK components, +

          Caution: Before you install SDK packages, we recommend that you disable any antivirus software that may be running on your computer. There are cases in which antivirus software on Windows is known to interfere with the installation process, so we suggest you disable your antivirus until installation is complete.

          -

          Follow these steps to install new SDK components in your environment:

          +

          Follow these steps to install new SDK packages in your environment:

            -
          1. Launch the Android SDK and AVD Manager as described in the section above.
            2. +
          2. Launch the Android SDK Manager as described in the section above.
          3. Select Available Packages in the left panel. - This will reveal all of the components that are currently available for download + This will reveal all of the packages that are currently available for download from the SDK repository.
            4. -
          4. Select the component(s) you'd like to install and click Install +
          5. Select the package(s) you'd like to install and click Install Selected. (If you aren't sure which packages to select, read Recommended Components.)
            6. -
          6. 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 + href="installing.html#which">Recommended Packages.)
            7. +
          7. Verify and accept the packages you want (ensure each one is selected with a green +checkmark) and click Install. The packages will now be installed into your existing Android SDK directories.
          @@ -114,60 +114,60 @@ and new documentation is saved in the existing <sdk>/docs/ directory (old docs are replaced).

          -

          Updating SDK Components

          +

          Updating SDK Packages

          -

          From time to time, new revisions of existing SDK components are released and +

          From time to time, new revisions of existing SDK packages are released and made available to you through the SDK repository. In most cases, if you have those -components installed in your environment, you will want +packages installed in your environment, you will want to download the new revisions as soon as possible.

          You can learn about the release of new revisions in two ways:

          • You can watch for updates listed in the "SDK" tab of the Android Developers -site, in the "Downloadable SDK Components" section.
            • +site, in the "Downloadable SDK Packages" section.
          • You can watch for updates listed in the Available Packages -panel of the Android SDK and AVD Manager.
            • +panel of the Android SDK Manager.
          -

          When you see that a new revision is available, you can use the Android SDK -and AVD Manager to quickly download it to your environment. Follow the same -procedure as given in Installing SDK Components, above. The new -component is installed in place of the old, but without impacting your +

          When you see that a new revision is available, you can use the Android SDK Manager to quickly +download it to your environment. Follow the same +procedure as given in Installing SDK Packages, above. The new +package is installed in place of the old, but without impacting your applications.

          Tip: -Use the "Display updates only" checkbox to show only the components +Use the "Display updates only" checkbox to show only the packages you do not have.

          -

          SDK Component Dependencies

          +

          SDK Package Dependencies

          -

          In some cases, an SDK component may require a specific minimum revision of -another component or SDK tool. Where such dependencies exist, they are -documented in the revision notes for each component, available from the links in -the "Downloadable SDK Components" section at left.

          +

          In some cases, an SDK package may require a specific minimum revision of +another package or SDK tool. Where such dependencies exist, they are +documented in the revision notes for each package, available from the links in +the "Downloadable SDK packages" section at left.

          For example, there may be a dependency between the ADT Plugin for Eclipse and -the SDK Tools component. When you install the SDK Tools -component, you should also upgrade to the required version of ADT (if you +the SDK Tools package. When you install the SDK Tools +package, you should also upgrade to the required version of ADT (if you are developing in Eclipse). In this case, the major version number for your ADT plugin should always match the revision number of your SDK Tools (for example, ADT 8.x requires SDK Tools r8).

          Also make sure that, each time you install a new version of the Android platform, you have -the latest version of the SDK Platform-tools component. The SDK Platform-tools contain +the latest version of the SDK Platform-tools package. The SDK Platform-tools contain tools that are backward compatible with all versions of the Android platform and are often updated to support new features in the latest version of the Android platform.

          The development tools will notify you with debug warnings if there is dependency that you need to -address. The SDK and AVD Manager also enforces dependencies by requiring that you download any -components that are needed by those you have selected.

          +address. The Android SDK Manager also enforces dependencies by requiring that you download any +packages that are needed by those you have selected.

          Adding New Sites

          -

          By default, Available Packages displays components available from the +

          By default, Available Packages displays packages 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.

          @@ -178,7 +178,7 @@ to develop using their libraries, you must install their Android SDK add-on, if 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 +on their web site, follow these steps to add their site to the Android SDK Manager:

            @@ -186,7 +186,7 @@ Manager:

          1. 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 a new item named +

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

          @@ -194,12 +194,12 @@ Manager:

          Problems connecting to the SDK repository

          -

          If you are using the SDK and AVD Manager to download components and are encountering +

          If you are using the Android SDK Manager to download packages and are encountering connection problems, try connecting over http, rather than https. To switch the -protocol used by the SDK and AVD Manager, follow these steps:

          +protocol used by the Android SDK Manager, follow these steps:

            -
          1. With the Android SDK and AVD Manager window open, select "Settings" in the +
          2. With the Android SDK Manager window open, select "Settings" in the left pane.
          3. On the right, in the "Misc" section, check the checkbox labeled "Force https://... sources to be fetched using http://..."
            4. diff --git a/docs/html/sdk/android-3.0.jd b/docs/html/sdk/android-3.0.jd index 39a234f77d718..3acb35885af86 100644 --- a/docs/html/sdk/android-3.0.jd +++ b/docs/html/sdk/android-3.0.jd @@ -25,7 +25,8 @@ Differences Report »

            See Also

              -
            1. Optimizing Apps for Android 3.0
              2. +
            2. Supporting Tablets and +Handsets
            @@ -41,7 +42,7 @@ libraries.

            To get started developing or testing against Android {@sdkPlatformVersion}, use the Android SDK Manager to download the platform into your SDK. For more information, see Adding SDK Components. If you are new to Android, Adding SDK Packages. If you are new to Android, download the SDK Starter Package first.

            For a high-level introduction to Android {@sdkPlatformVersion}, see the .

            If you've already published an Android application, please test and optimize your application on Android 3.0 as soon as possible. You should do so to be sure your application provides the best experience possible on the latest Android-powered devices. For information about what you can do, -read Optimizing Apps for Android -3.0.

            +read Supporting Tablets and +Handsets.

            Revisions

            diff --git a/docs/html/sdk/compatibility-library.jd b/docs/html/sdk/compatibility-library.jd index 30d807ff93009..f81e8aea2bfa0 100644 --- a/docs/html/sdk/compatibility-library.jd +++ b/docs/html/sdk/compatibility-library.jd @@ -330,13 +330,13 @@ Android 3.2 and higher (all other APIs in the v4 library are already available w

            Downloading the Support Package

            -

            The Support Package is provided as a downloadable package from the Android SDK and AVD +

            The Support Package is provided as a downloadable package from the Android SDK Manager. To install:

              -
            1. Launch the SDK and AVD Manager. +
            2. Launch the Android SDK Manager.

              From Eclipse, you can select Window -> Android SDK and AVD Manager. Or, launch {@code SDK Manager.exe} from +> Android SDK Manager. Or, launch {@code SDK Manager.exe} from the {@code <sdk>/} directory (on Windows only) or {@code android} from the {@code <sdk>/tools/} directory.

            3. Expand the Android Repository, check Android Support package diff --git a/docs/html/sdk/eclipse-adt.jd b/docs/html/sdk/eclipse-adt.jd index 3019544b2bbf5..485f01e50f399 100644 --- a/docs/html/sdk/eclipse-adt.jd +++ b/docs/html/sdk/eclipse-adt.jd @@ -36,7 +36,7 @@ that is designed to give you a powerful, integrated environment in which to build Android applications.

              ADT extends the capabilities of Eclipse to let you quickly set up new Android -projects, create an application UI, add components based on the Android +projects, create an application UI, add packages based on the Android Framework API, debug your applications using the Android SDK tools, and even export signed (or unsigned) {@code .apk} files in order to distribute your application.

              @@ -468,7 +468,7 @@ ADT 12.0.0 (July 2011)
              ADT 12.0.0 is designed for use with SDK Tools r12. If you haven't already installed SDK Tools r12 into your SDK, use -the Android SDK and AVD Manager to do so.
              +the Android SDK Manager to do so.
              Visual Layout Editor:
              @@ -520,7 +520,7 @@ ADT 11.0.0 (June 2011)
              Dependencies:
              ADT 11.0.0 is designed for use with SDK Tools r11. If you haven't -already installed SDK Tools r11 into your SDK, use the Android SDK and AVD Manager to do +already installed SDK Tools r11 into your SDK, use the Android SDK Manager to do so.
              Visual Refactoring:
              @@ -656,7 +656,7 @@ ADT 10.0.1 (March 2011)
              Dependencies:
              ADT 10.0.1 is designed for use with SDK Tools r10. If you haven't -already installed SDK Tools r10 into your SDK, use the Android SDK and AVD Manager to do +already installed SDK Tools r10 into your SDK, use the Android SDK Manager to do so.
              General notes:
              @@ -686,7 +686,7 @@ ADT 10.0.0 (February 2011)
              Dependencies:
              ADT 10.0.0 is designed for use with SDK Tools r10. If you haven't -already installed SDK Tools r10 into your SDK, use the Android SDK and AVD Manager to do +already installed SDK Tools r10 into your SDK, use the Android SDK Manager to do so.
              General notes:
              @@ -736,7 +736,7 @@ ADT 9.0.0 (January 2011)
              Dependencies:
              ADT 9.0.0 is designed for use with SDK Tools r9. If you haven't -already installed SDK Tools r9 into your SDK, use the Android SDK and AVD Manager to do +already installed SDK Tools r9 into your SDK, use the Android SDK Manager to do so.
              General notes:
              @@ -845,7 +845,7 @@ ADT 8.0.1 (December 2010)
              Dependencies:

              ADT 8.0.1 is designed for use with SDK Tools r8. If you haven't -already installed SDK Tools r8 into your SDK, use the Android SDK and AVD Manager to do +already installed SDK Tools r8 into your SDK, use the Android SDK Manager to do so.

              General notes:
              @@ -874,7 +874,7 @@ ADT 8.0.0 (December 2010)
              Dependencies:

              ADT 8.0.0 is designed for use with SDK Tools r8. If you haven't -already installed SDK Tools r8 into your SDK, use the Android SDK and AVD Manager to do +already installed SDK Tools r8 into your SDK, use the Android SDK Manager to do so.

              General notes:
              @@ -1020,8 +1020,8 @@ ADT 0.9.6 (March 2010)
              Dependencies:

              ADT 0.9.6 is designed for use with SDK Tools r5 and later. Before -updating to ADT 0.9.6, we highly recommend that you use the Android SDK and -AVD Manager to install SDK Tools r5 into your SDK.

              +updating to ADT 0.9.6, we highly recommend that you use the Android SDK Manager to install SDK +Tools r5 into your SDK.

              General Notes:
              @@ -1038,8 +1038,8 @@ first time with the SDK Usage panel.
              4. AVD/SDK Manager:
                -
              • Adds support for platform samples components.
                • -
              • Improves support for dependency between components.
                • +
              • Adds support for platform samples packages.
                • +
              • Improves support for dependency between packages.
              • AVDs now sorted by API level.
              • The AVD creation dialog now enforces a minimum SD card size of 9MB.
              • Prevents deletion of running AVDs.
                • @@ -1087,9 +1087,9 @@ ADT 0.9.5 (December 2009)
                Dependencies:

                ADT 0.9.5 requires features provided in SDK Tools r4 or higher. If you install -ADT 0.9.5, which is highly recommended, you should use the Android SDK and AVD +ADT 0.9.5, which is highly recommended, you should use the Android SDK Manager to download the latest SDK Tools into your SDK. For more information, -see Adding SDK Components.

                +see Adding SDK Packages.

                General notes:
                @@ -1114,9 +1114,9 @@ ADT 0.9.4 (October 2009)
                Dependencies:

                ADT 0.9.4 requires features provided in SDK Tools r3 or higher. If you install -ADT 0.9.4, which is highly recommended, you should use the Android SDK and AVD +ADT 0.9.4, which is highly recommended, you should use the Android SDK Manager to download the latest SDK Tools into your SDK. For more information, -see Adding SDK Components.

                +see Adding SDK Packages.

                Project Creation Wizard:
                @@ -1318,9 +1318,9 @@ to follow these steps again instead of the default update instructions.

                Other install errors

                Note that there are features of ADT that require some optional -Eclipse components (for example, WST). If you encounter an error when -installing ADT, your Eclipse installion might not include these components. -For information about how to quickly add the necessary components to your +Eclipse packages (for example, WST). If you encounter an error when +installing ADT, your Eclipse installion might not include these packages. +For information about how to quickly add the necessary packages to your Eclipse installation, see the troubleshooting topic ADT Installation Error: "requires plug-in org.eclipse.wst.sse.ui".

                @@ -1345,9 +1345,9 @@ you should update to it as soon as convenient.

                In some cases, a new revision of ADT will have a dependency on a specific revision of the Android SDK Tools. If such dependencies exist, you will need to -update the SDK Tools component of the SDK after installing the new revision of -ADT. To update the SDK Tools component, use the Android SDK and AVD Manager, as -described in Adding SDK Components.

                +update the SDK Tools package of the SDK after installing the new revision of +ADT. To update the SDK Tools package, use the Android SDK Manager, as +described in Adding SDK Packages.

                To learn about new features of each ADT revision and also any dependencies on the SDK Tools, see the listings in the Revisions diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd index c09b3c23ef3e0..175ab50a739f5 100644 --- a/docs/html/sdk/index.jd +++ b/docs/html/sdk/index.jd @@ -28,7 +28,7 @@ sdk.linux_checksum=14e99dfa8eb1a8fadd2f3557322245c4

              • Install the SDK starter package from the table above. (If you're on Windows, download the installer for help with the initial setup.)
              • Install the ADT Plugin for Eclipse (if you'll be developing in Eclipse).
                • -
              • Add Android platforms and other components to your SDK.
                • +
              • Add Android platforms and other packages to your SDK.
              • Explore the contents of the Android SDK (optional).
            diff --git a/docs/html/sdk/installing.jd b/docs/html/sdk/installing.jd index 1dce483c273b8..7461eb0c427a3 100644 --- a/docs/html/sdk/installing.jd +++ b/docs/html/sdk/installing.jd @@ -53,10 +53,10 @@ function toggleDiv(link) {
          4. 1. Preparing Your Development Computer
          5. 2. Downloading the SDK Starter Package
          6. 3. Installing the ADT Plugin for Eclipse
            7. -
          7. 4. Adding Platforms and Other Components +
          8. 4. Adding Platforms and Other Packages
              -
            1. Available Components
              2. -
            2. Recommended Components
              3. +
            3. Available Packages
              4. +
            4. Recommended Packages
          9. 5. Exploring the SDK (Optional)
          10. Next Steps
            11. @@ -66,7 +66,7 @@ function toggleDiv(link) {

            See also

            1. ADT Plugin for Eclipse
              2. -
            2. Adding SDK Components
              3. +
            3. Adding SDK Packages
            @@ -81,9 +81,9 @@ this page.

            Updating?

            -

            If you already have an Android SDK, use the Android SDK and AVD Manager tool to install +

            If you already have an Android SDK, use the Android SDK Manager tool to install updated tools and new Android platforms into your existing environment. For information about how to -do that, see Adding SDK Components.

            +do that, see Adding SDK Packages.

            Step 1. Preparing Your Development Computer

            @@ -111,7 +111,7 @@ RCP version of Eclipse is recommended.

            The SDK starter package is not a full development environment—it includes only the core SDK Tools, which you can -use to download the rest of the SDK components (such as the latest Android platform).

            +use to download the rest of the SDK packages (such as the latest Android platform).

            If you haven't already, get the latest version of the SDK starter package from the SDK download page.

            @@ -154,53 +154,53 @@ developing in Eclipse or other IDEs.

            -

            Step 4. Adding Platforms and Other Components

            +

            Step 4. Adding Platforms and Other Packages

            -

            The last step in setting up your SDK is using the Android SDK and AVD Manager (a -tool included in the SDK starter package) to download essential SDK components into your development +

            The last step in setting up your SDK is using the Android SDK Manager (a +tool included in the SDK starter package) to download essential SDK packages into your development environment.

            The SDK uses a modular structure that separates the major parts of the SDK—Android platform versions, add-ons, tools, samples, and documentation—into a set of separately installable -components. The SDK starter package, which you've already downloaded, includes only a single -component: the latest version of the SDK Tools. To develop an Android application, you also need to +packages. The SDK starter package, which you've already downloaded, includes only a single +package: the latest version of the SDK Tools. To develop an Android application, you also need to download at least one Android platform and the associated platform tools. You can add other -components and platforms as well, which is highly recommended.

            +packages and platforms as well, which 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 +Android SDK Manager with a default set of platforms and other packages 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.

            +packages and install them. You can then skip to Step 5, but we +recommend you first read the section about the Available Packages to +better understand the packages available from the Android SDK Manager.

            -

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

            +

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

              -
            • From within Eclipse, select Window > Android SDK and AVD Manager.
              • +
            • From within Eclipse, select Window > Android SDK Manager.
            • On Windows, double-click the SDK Manager.exe file at the root of the Android SDK directory.
            • On Mac or Linux, open a terminal and navigate to the tools/ directory in the Android SDK, then execute: 
              android
            -

            To download components, use the graphical UI of the Android SDK and AVD +

            To download packages, use the graphical UI of the Android SDK Manager to browse the SDK repository and select new or updated -components (see figure 1). The Android SDK and AVD Manager installs the selected components in -your SDK environment. For information about which components you should download, see Recommended Components.

            +packages (see figure 1). The Android SDK Manager installs the selected packages in +your SDK environment. For information about which packages you should download, see Recommended Packages.

            -

            Figure 1. The Android SDK and AVD Manager's -Available Packages panel, which shows the SDK components that are +

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

            -

            Available Components

            +

            Available Packages

            -

            By default, there are two repositories of components for your SDK: Android +

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

            -

            The Android Repository offers these types of components:

            +

            The Android Repository offers these types of packages:

            • SDK Tools — Contains tools for debugging and testing your application @@ -219,9 +219,9 @@ developer guide.
            • Android platforms — An SDK platform is available for every production Android platform deployable to Android-powered devices. Each -SDK platform component includes a fully compliant Android library, system image, sample code, +SDK platform package includes a fully compliant Android library, system image, sample code, and emulator skins. To learn more about a specific platform, see the list of platforms that appears -under the section "Downloadable SDK Components" on the left part of this page.
              • +under the section "Downloadable SDK Packages" on the left part of this page.
            • USB Driver for Windows (Windows only) — Contains driver files that you can install on your Windows computer, so that you can run and debug @@ -243,16 +243,16 @@ tutorials. -->
              • multiversion documentation for the Android framework API.
            -

            The Third party Add-ons provide components that allow you to create a development +

            The Third party Add-ons provide packages 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

            +

            Recommended Packages

            -

            The SDK repository contains a range of components that you can download. -Use the table below to determine which components you need, based on whether you +

            The SDK repository contains a range of packages that you can download. +Use the table below to determine which packages you need, based on whether you want to set up a basic, recommended, or full development environment:

            @@ -260,7 +260,7 @@ want to set up a basic, recommended, or full development environment: Environment -SDK Component +SDK Package Comments @@ -268,8 +268,8 @@ want to set up a basic, recommended, or full development environment: Basic SDK Tools If you've just installed -the SDK starter package, then you already have the latest version of this component. The -SDK Tools component is required to develop an Android application. Make sure you keep this up to +the SDK starter package, then you already have the latest version of this package. The +SDK Tools package is required to develop an Android application. Make sure you keep this up to date. @@ -300,21 +300,21 @@ style="border:none"> Recommended
            (plus Basic) Documentation -The Documentation component is useful because it lets you work offline and +The Documentation package is useful because it lets you work offline and also look up API reference information from inside Eclipse. Samples -The Samples components give you source code that you can use to learn about +The Samples packages give you source code that you can use to learn about Android, load as a project and run, or reuse in your own app. Note that multiple -samples components are available — one for each Android platform version. When -you are choosing a samples component to download, select the one whose API Level +samples packages are available — one for each Android platform version. When +you are choosing a samples package to download, select the one whose API Level matches the API Level of the Android platform that you plan to use. Usb Driver -The Usb Driver component is needed only if you are developing on Windows and +The Usb Driver package is needed only if you are developing on Windows and have an Android-powered device on which you want to install your application for debugging and testing. For Mac OS X and Linux platforms, no special driver is needed. @@ -344,12 +344,12 @@ applications on different platforms by running in an Android Virtual Device -

            Once you've installed at least the basic configuration of SDK components, you're ready to start +

            Once you've installed at least the basic configuration of SDK packages, you're ready to start developing Android apps. The next section describes the contents of the Android SDK to familiarize -you with the components you've just installed.

            +you with the packages you've just installed.

            -

            For more information about using the Android SDK and AVD Manager, see the Adding SDK Components document.

            +

            For more information about using the Android SDK Manager, see the Adding SDK Packages document.

            Step 5. Exploring the SDK (Optional)

            @@ -358,7 +358,7 @@ href="{@docRoot}sdk/adding-components.html">Adding SDK Components document. and add-ons that you need, we suggest that you open the SDK directory and take a look at what's inside.

            -

            The table below describes the full SDK directory contents, with components +

            The table below describes the full SDK directory contents, with packages installed.

            @@ -405,20 +405,21 @@ platform version. - +
            tools/ Contains the set of development and profiling tools that are platform-independent, such -as the emulator, the Android SDK and AVD Manager, ddms, hierarchyviewer -and more. The tools in this directory may be updated at any time using the Android SDK and AVD +as the emulator, the Android SDK Manager, the AVD Manager, ddms, +hierarchyviewer +and more. The tools in this directory may be updated at any time using the Android SDK Manager and are independent of platform releases.
            SDK Readme.txt A file that explains how to perform the initial setup of your SDK, -including how to launch the Android SDK and AVD Manager tool on all +including how to launch the Android SDK Manager tool on all platforms.
            SDK Manager.exeWindows SDK only. A shortcut that launches the Android SDK and AVD -Manager tool, which you use to add components to your SDK.Windows SDK only. A shortcut that launches the Android SDK +Manager tool, which you use to add packages to your SDK.