From 4e44b76fdfc45d2621bd1c279507be842c636034 Mon Sep 17 00:00:00 2001 From: Dirk Dougherty <> Date: Mon, 13 Apr 2009 16:51:21 -0700 Subject: [PATCH] AI 146010: am: CL 145858 am: CL 145559 Cleanup for early-look SDK. Original author: ddougherty Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146010 --- docs/html/sdk/1.5_r1/index.jd | 29 +-- docs/html/sdk/1.5_r1/installing.jd | 312 +-------------------------- docs/html/sdk/1.5_r1/requirements.jd | 6 +- docs/html/sdk/1.5_r1/upgrading.jd | 39 +++- docs/html/sdk/android-1.5.jd | 233 +------------------- docs/html/sdk/terms.jd | 36 ++-- docs/html/sdk/terms_body.html | 38 ++-- 7 files changed, 81 insertions(+), 612 deletions(-) diff --git a/docs/html/sdk/1.5_r1/index.jd b/docs/html/sdk/1.5_r1/index.jd index 345489ad74806..412887a95257d 100644 --- a/docs/html/sdk/1.5_r1/index.jd +++ b/docs/html/sdk/1.5_r1/index.jd @@ -1,21 +1,20 @@ -page.title=Android 1.5 SDK, Release 1 - -sdk.version=1.5_r1 +sdk.version=1.5 +sdk.rel.id=1 sdk.date=April 2009 -sdk.win_download=android-sdk-windows-1.5_r1.zip +sdk.win_download= sdk.win_bytes= sdk.win_checksum= -sdk.mac_download=android-sdk-mac_x86-1.5_r1.zip +sdk.mac_download= sdk.mac_bytes= sdk.mac_checksum= -sdk.linux_download=android-sdk-linux_x86-1.5_r1.zip +sdk.linux_download= sdk.linux_bytes= sdk.linux_checksum= - +page.title=Download Android SDK @jd:body

SDK Contents

@@ -25,7 +24,7 @@ sdk.linux_checksum=

The SDK includes a variety of tools for developing and debugging application code and designing an application UI. You can read about the tools in the Dev Guide and access them in the <sdk>/tools/ directory. -

The tools package included in this SDK is the same as that included in the Android 1.0, Release 2 SDK.

+

The tools package included in this SDK includes many updates from that provided in the previous SDK and requires you to migrate your applications to the new development environment. For details, see the Upgrading the SDK document.

System Images

@@ -40,17 +39,23 @@ sdk.linux_checksum= Android 1.5 3 Version Notes -Includes com.google.android.maps external library and a set of standard development applications. +Includes a set of standard development applications. + + +Android 1.1 +2 +Version Notes +Includes a set of standard development applications. -

Sample Code and Applications

You can look at a variety of tutorials and samples in the Dev Guide and access the sample code itself -in the <sdk>/samples/ directory of the SDK package.

+in the <sdk>/platforms/android-1.5/samples/ directory of the SDK package. Note the new location — the SDK now includes multiple platform versions that you can develop against and each has its own sample code directory.

+ diff --git a/docs/html/sdk/1.5_r1/installing.jd b/docs/html/sdk/1.5_r1/installing.jd index df9ec3aee89b5..a1f7cffb0576e 100644 --- a/docs/html/sdk/1.5_r1/installing.jd +++ b/docs/html/sdk/1.5_r1/installing.jd @@ -1,312 +1,10 @@ -page.title=Installing the Android SDK -sdk.version=1.5_r1 +sdk.version=1.5 +sdk.rel.id=1 +sdk.date=April 2009 +page.title=Installing the Android SDK @jd:body - -

This page describes how to install the Android SDK and set up your -development environment. If you haven't downloaded the SDK, you can -do so from the -Download page.

- -

If you encounter any problems during installation, see the -Installation Notes at the bottom of -this page.

- -

Upgrading?

-

If you have already developed applications using an earlier version -of the SDK, please skip this page and read the -Upgrading the -SDK document instead. -

- - -

Preparing for Installation

- -

Before you get started with the Android SDK, take a moment to confirm -that your development machine meets the system requirements. -

- -

If you will be developing on Eclipse with the Android Development -Tools (ADT) Plugin — the recommended path if you are new to -Android — make sure that you have a suitable version of Eclipse -installed on your computer. If you need to install Eclipse, you can -download it from this location:

- -

http://www.eclipse.org/downloads/

- -

A Java or RCP version of Eclipse is recommended.

- -

Installing the SDK

- -

After downloading the SDK, unpack the .zip archive to a suitable location on your machine. By default, the SDK files are unpacked into a directory named android_sdk_<platform>_<release>_<build>. The directory contains a link to a local copy of the documentation and the subdirectories tools/, samples/, and others.

- -

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

- -

Optionally, you can add the path to the SDK tools directory to your path. As mentioned above, the tools/ directory is located in the SDK directory.

- - -

Adding 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 tools directory. Note that, if you update your SDK, you should remember to update your PATH settings to point to the new location, if different.

- - -

If you will be using the Eclipse IDE as your environment for developing Android applications, continue reading the next -section in order to install the Android Development Tools plugin and set up Eclipse. If you choose not to use Eclipse, you can -develop Android applications using other tools — read the guide to developing -in other IDEs.

- - -

Installing the ADT Plugin for Eclipse

- -

Android offers a custom plugin for the Eclipse IDE, called Android -Development Tools (ADT), that is designed to give you a powerful, -integrated environment in which to build Android applications. It -extends the capabilites of Eclipse to let you quickly set up new Android -projects, create an application UI, add components based on the Android -Framework API, and debug using the Android SDK tools.

- -

If you are new to Android or want to develop using the Eclipse IDE, -the ADT plugin will be an essential part of your development -environment. In general, using Eclipse with ADT is a highly recommended -approach and is the fastest way to get started. This section describes -how to install ADT into your Eclipse environment. - -

If you prefer to work in a development environment other than Eclipse, -you do not need to install Eclipse or the ADT Plugin. Instead, you can -access the SDK tools directly to build and debug your application.

- -

Once you have Eclipse installed, as described in -Preparing for Installation, follow the steps below to -download the ADT plugin and install it in your respective Eclipse -environment.

- - - - - - - -
Eclipse 3.3 (Europa)Eclipse 3.4 (Ganymede)
-
    -
  1. Start Eclipse, then select Help > Software Updates > Find - and Install....
  2. - -
  3. In the dialog that appears, select Search for new features to install and click Next.
  4. -
  5. Click New Remote Site.
  6. -
  7. In the resulting dialog box, enter a name for the remote site (e.g. Android Plugin) and enter this as its URL: -
    https://dl-ssl.google.com/android/eclipse/
    -

    Alternatively, you can use http in the Location URL, if you are having - trouble with https (https is preferred for security reasons).

    -
    http://dl-ssl.google.com/android/eclipse/
    -

    Click OK.

  8. -
  9. You should now see the new site added to the search list (and checked). - Click Finish.
  10. -
  11. In the subsequent Search Results dialog box, select the checkbox for - Android Plugin > Developer Tools. - This will check both features: "Android Developer Tools", and "Android - Editors". The Android Editors feature is optional, but recommended. If - you choose to install it, you need the WST plugin mentioned earlier in this - page. Click Next.
  12. -
  13. Read the license agreement and then select Accept terms of the license agreement. - Click Next.
  14. -
  15. Click Finish.
  16. - -
  17. The ADT plugin is not signed; you can accept the installation anyway - by clicking Install All.
  18. -
  19. Restart Eclipse.
  20. -
- -
- -
    -
  1. Start Eclipse, then select Help > Software Updates.... -
  2. -
  3. In the dialog that appears, click the Available Software tab. -
  4. -
  5. Click Add Site... -
  6. -
  7. Enter this as the Location: -
    https://dl-ssl.google.com/android/eclipse/
    -

    Alternatively, you can use http in the Location URL, if you are having - trouble with https (https is preferred for security reasons).

    -
    http://dl-ssl.google.com/android/eclipse/
    -

    Click OK.

  8. -
  9. Back in the Available Software view, you should see the plugin. Select the checkbox next to - Developer Tools and click Install... -
  10. -
  11. On the subsequent Install window, "Android Developer Tools", and "Android Editors" should both be checked. - The Android Editors feature is optional, but recommended. If - you choose to install it, you need the WST plugin mentioned earlier in this - page. Click Next. -
  12. -
  13. Accept the license agreement and click Finish.
  14. -
  15. Restart Eclipse.
  16. -
- -
- -

Now, you just need to modify your Eclipse preferences to point to the Android SDK directory:

-
    -
  1. Select Window > Preferences... to open the Preferences - panel. (Mac OS X: Eclipse > Preferences)
  2. -
  3. Select Android from the left panel.
  4. -
  5. For the SDK Location in the main panel, click Browse... and locate the SDK directory.
  6. -
  7. Click Apply, then OK.
  8. -
- -

Done! If you haven't encountered any problems, then you're ready to -begin developing Android applications. See the After -Installation: Next Steps section for suggestions on how to start.

- - -

Troubleshooting ADT Installation

-

-If you are having trouble downloading the ADT plugin after following the steps above, here are some suggestions:

- - -

-If you are still unable to use Eclipse to download the ADT plugin as a remote update site, you can download the ADT files to your local machine using a browser and the install the files in Eclipse from there: -

-
    -
  1. Download the ADT zip file (do not unpack it). -
  2. Follow steps 1 and 2 in the default install instructions (above). -
  3. In Eclipse 3.3, click New Archive Site....
    - In Eclipse 3.4, click Add Site..., then Archive... -
  4. Browse and select the downloaded the zip file. -
  5. Follow the remaining procedures, above, starting from steps 5. -
-

-Note that to update your plugin, you will have to follow these steps again instead of the default update instructions.

- -

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

- -

For Linux users

-

If you encounter this error when installing the ADT Plugin for Eclipse: -

-An error occurred during provisioning.
-Cannot connect to keystore.
-JKS
-

-...then your development machine lacks a suitable Java VM. Installing Sun -Java 6 will resolve this issue and you can then reinstall the ADT -Plugin.

- - -

After Installation: Next Steps

-

Once you have installed the SDK and the ADT Plugin, you are ready to -begin developing applications. Here are a few ways you can get started:

- -

Learn about Android

- - -

Explore the SDK

- - -

Explore some code

- - -

Visit the Android developer groups

- - - -

Installation Notes

-

Ubuntu Linux Notes

- -

Other Linux Notes

- +

See the Download page for more information.

diff --git a/docs/html/sdk/1.5_r1/requirements.jd b/docs/html/sdk/1.5_r1/requirements.jd index 3f0deca92210e..c3ee8f7eac44f 100644 --- a/docs/html/sdk/1.5_r1/requirements.jd +++ b/docs/html/sdk/1.5_r1/requirements.jd @@ -1,11 +1,7 @@ page.title=System Requirements - -sdk.version=1.5_r1 -sdk.date=April 2009 - @jd:body -

The sections below describe the system and software requirements for developing Android applications using the Android SDK tools included in Android 1.5 SDK, Release 1.

+

The sections below describe the system and software requirements for developing Android applications using the Android SDK tools included in Android SDK, Release .

Supported Operating Systems