summaryrefslogtreecommitdiffstats
path: root/docs/html/sdk
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2009-03-02 22:54:33 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-02 22:54:33 -0800
commit3dec7d563a2f3e1eb967ce2054a00b6620e3558c (patch)
treeaa3b0365c47cb3c1607c0dc76c8d32b4046fc287 /docs/html/sdk
parent15ab3eae2ec3d73b3e8aa60b33ae41445bf83f4b (diff)
downloadframeworks_base-3dec7d563a2f3e1eb967ce2054a00b6620e3558c.zip
frameworks_base-3dec7d563a2f3e1eb967ce2054a00b6620e3558c.tar.gz
frameworks_base-3dec7d563a2f3e1eb967ce2054a00b6620e3558c.tar.bz2
auto import from //depot/cupcake/@137055
Diffstat (limited to 'docs/html/sdk')
-rw-r--r--docs/html/sdk/1.0_r1/index.jd81
-rw-r--r--docs/html/sdk/1.0_r1/installing.jd171
-rw-r--r--docs/html/sdk/1.0_r1/upgrading.jd103
-rw-r--r--docs/html/sdk/1.0_r2/index.jd81
-rw-r--r--docs/html/sdk/1.0_r2/installing.jd171
-rw-r--r--docs/html/sdk/1.0_r2/requirements.jd44
-rw-r--r--docs/html/sdk/1.0_r2/upgrading.jd103
-rw-r--r--docs/html/sdk/1.1_r1/index.jd12
-rw-r--r--docs/html/sdk/1.1_r1/installing.jd139
-rw-r--r--docs/html/sdk/sdk_toc.cs44
10 files changed, 644 insertions, 305 deletions
diff --git a/docs/html/sdk/1.0_r1/index.jd b/docs/html/sdk/1.0_r1/index.jd
index d236844..b6e0e9f 100644
--- a/docs/html/sdk/1.0_r1/index.jd
+++ b/docs/html/sdk/1.0_r1/index.jd
@@ -22,43 +22,44 @@ sdk.linux_checksum=2660b4029039b7d714e59827e9a9a11d
<h2>Included in this SDK</h2>
-<p>This SDK includes some awesome stuff.</p>
-
-
-<h2>System and Software Requirements</h2>
-
-<p>The following systems and development environments are supported by this SDK.</p>
-
-<h4>Supported Operating Systems:</h4>
-<ul>
- <li>Windows XP or Vista</li>
- <li>Mac OS X 10.4.8 or later (x86 only)</li>
- <li>Linux (tested on Linux Ubuntu Dapper Drake)</li>
-</ul>
-
-<h4>Supported Development Environments:</h4>
-<ul>
- <li>Eclipse IDE
- <ul>
- <li><a href="http://www.eclipse.org/downloads/">Eclipse</a> 3.3 (Europa), 3.4 (Ganymede)
- <ul>
- <li>Eclipse <a href="http://www.eclipse.org/jdt">JDT</a> plugin (included in most Eclipse IDE packages) </li>
- <li><a href="http://www.eclipse.org/webtools">WST</a> (optional, but needed for the Android Editors feature; included in <a href="http://www.eclipse.org/downloads/moreinfo/compare.php">most Eclipse IDE packages</a>)</li>
- </ul>
- </li>
- <li><a href="http://java.sun.com/javase/downloads/index.jsp">JDK 5 or JDK 6</a> (JRE alone is not sufficient)</li>
- <li><a href="installing.html#installingplugin">Android Development Tools plugin</a> (optional)</li>
- <li><strong>Not</strong> compatible with Gnu Compiler for Java (gcj)</li>
- </ul>
- </li>
- <li>Other development environments or IDEs
- <ul>
- <li><a href="http://java.sun.com/javase/downloads/index.jsp">JDK 5 or JDK 6</a> (JRE alone is not sufficient)</li>
- <li><a href="http://ant.apache.org/">Apache Ant</a> 1.6.5 or later for Linux and Mac, 1.7 or later for Windows</li>
- <li><strong>Not</strong> compatible with Gnu Compiler for Java (gcj)</li>
- </ul>
- </li>
-</ul>
-
-<p class="note"><strong>Note:</strong> If JDK is already installed on your development computer, please take a moment to make sure that it meets the version requirements listed above. In
-particular, note that some Linux distributions may include JDK 1.4 or Gnu Compiler for Java, both of which are not supported for Android development. </p> \ No newline at end of file
+<h4>Development tools</h4>
+
+<p>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 documentation included with the SDK.
+You can access the tools in the <code>&lt;sdk&gt;/tools/</code> directory.</p>
+
+<h4 id="system_images">System Images</h4>
+
+<p>The Android system images listed below are included in this SDK.</p>
+
+<table style="margin-right:1em;" width="80%">
+<tr>
+<th><nobr>System Image</nobr></th><th><nobr>API Level</nobr></th><th>Notes</th><th>Description</th>
+</tr>
+
+<tr>
+<td width="5%"><nobr>Android 1.0</nobr></td>
+<td width="5%">1</td>
+<td width="5%"><nobr>N/A</nobr></td>
+<td>Includes the {@code com.google.android.maps} external library and a set of standard development
+applications. </td>
+
+</tr>
+
+</table>
+
+<h4>Sample Code and Applications</h4>
+
+<p>You can look at a variety of tutorials and samples in the
+documentation included with the SDK and access the sample code itself
+in the <code>&lt;sdk&gt;/samples/</code> directory of the SDK package.</p>
+
+<h4>Documentation</h4>
+
+<p>The SDK package provides a full set of local documentation, including installation and upgrade
+instructions. To view it, open the <code>&lt;sdk&gt;/documentation.html</code> file in a web browser.
+If you are developing in an IDE such as Eclipse, you can also view the reference documentation
+directly in the IDE. </p>
+
+
+
diff --git a/docs/html/sdk/1.0_r1/installing.jd b/docs/html/sdk/1.0_r1/installing.jd
index 0f15396..8ac524c 100644
--- a/docs/html/sdk/1.0_r1/installing.jd
+++ b/docs/html/sdk/1.0_r1/installing.jd
@@ -1,29 +1,27 @@
page.title=Installing the SDK
+sdk.version=1.0_r1
@jd:body
+<p>For the current SDK release, see the links under <strong>Current SDK Release</strong> in the side navigation.</p>
-<p>This page describes how to install the Android SDK and set up your development environment. If you haven't
-downloaded the SDK yet, follow the link below.</p>
+<p>This page describes how to install the Android 1.0 SDK, Release 1, and set up your development environment.
+If you haven't downloaded the SDK yet, you can so from the <a href="{@docRoot}sdk/1.0_r1/index.html">Download</a> page.</p>
-<div class="linkbox"><a href="http://developer.android.com/sdk/">Download the SDK</a></div>
+<p>Before you begin, be sure that your development environment meets the SDK
+<a href="{@docRoot}sdk/1.0_r1/requirements.html">System Requirements</a>. If you encounter any problems during installation,
+see the <a href="#installnotes">Installation Notes</a> at the bottom of this page.</p>
-<p>Before you begin, be sure that you're development environment meets the SDK
-<a href="requirements.html">System and Software Requirements</a>.</p>
-
-<div class="special">
<h4 style="margin-top">Upgrading?</h4>
<p>If you have already developed applications using an earlier version of the
SDK, please skip this page and read the
-<b><a href="upgrading.html">Upgrading the SDK</a></b> document.
+<a href="{@docRoot}sdk/1.0_r1/upgrading.html"><strong>Upgrading the SDK</strong></a></b> document instead.
</p>
-</div>
-
<a name="installingsdk"></a>
<a name="setup"></a>
<h2>Installing the SDK</h2>
- <p>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 <code>android_sdk_<em>&lt;platform</em>&gt;_<em>&lt;release&gt;</em>_<em>&lt;build&gt;</em></code>. The directory contains the subdirectories <code>tools/</code>, <code>samples/</code>, and others. </p>
+ <p>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 <code>android_sdk_<em>&lt;platform</em>&gt;_<em>&lt;release&gt;</em>_<em>&lt;build&gt;</em></code>. The directory contains a link to a local copy of the documentation and the subdirectories <code>tools/</code>, <code>samples/</code>, and others. </p>
<p>Make a note of the name and location of the unpacked SDK directory on your system &mdash; you will need to refer to the SDK directory later, when setting up the Android plugin or using SDK tools. </p>
@@ -47,10 +45,86 @@ SDK, please skip this page and read the
<p>Adding <code>tools</code> to your path lets you run Android Debug Bridge (adb) and the other command line <a href="{@docRoot}guide/developing/tools/index.html">tools</a> 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.</p>
-<h3>Setting up Eclipse</h3>
-<p>If you'll be developing with the Eclipse IDE, follow the following procedure to setup the IDE
-to use the Android SDK.</p>
-<p>Basically, you just need to update your Eclipse preferences to point to the Android SDK directory:</p>
+
+<p>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 setup Eclipse. If you choose not to use Eclipse, you can
+develop Android applications using other tools &mdash; read the guide to developing
+<a href="{@docRoot}guide/developing/other-ide.html">In other IDEs</a>.</p>
+
+
+<h2>Setting up Eclipse</h2>
+
+<p>First, you should install a custom plugin called Android Development Tools (ADT), which adds integrated support for Android projects and tools. The ADT plugin includes a variety of powerful extensions that make creating, running, and debugging Android applications faster and easier. Developing in ADT/Eclipse is highly recommended for Eclipse users and those new to Android.</p>
+
+<p>To download and install the ADT plugin, follow the steps below for your respective Eclipse version. </p>
+
+<table style="font-size:100%">
+<tr><th>Eclipse 3.3 (Europa)</th><th>Eclipse 3.4 (Ganymede)</th></tr>
+<tr>
+<td width="45%">
+<ol>
+ <li>Start Eclipse, then select <strong>Help</strong> &gt; <strong>Software Updates</strong> &gt; <strong>Find
+ and Install...</strong>. </li>
+
+ <li>In the dialog that appears, select <strong>Search for new features to install</strong> and click <strong>Next</strong>. </li>
+ <li>Click <strong>New Remote Site</strong>. </li>
+ <li>In the resulting dialog box, enter a name for the remote site (e.g. Android Plugin) and enter this as its URL:
+ <pre>https://dl-ssl.google.com/android/eclipse/</pre>
+ <p>Alternatively, you can use http in the Location URL, if you are having
+ trouble with https (https is preferred for security reasons).</p>
+ <pre>http://dl-ssl.google.com/android/eclipse/</pre>
+ <p>Click <strong>OK</strong>.</p> </li>
+ <li>You should now see the new site added to the search list (and checked).
+ Click <strong>Finish</strong>. </li>
+ <li>In the subsequent Search Results dialog box, select the checkbox for
+ <strong>Android Plugin</strong> &gt; <strong>Developer Tools</strong>.
+ 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 <strong>Next</strong>. </li>
+ <li>Read the license agreement and then select <strong>Accept terms of the license agreement</strong>.
+ Click <strong>Next</strong>. </li>
+ <li>Click <strong>Finish</strong>. </li>
+
+ <li>The ADT plugin is not signed; you can accept the installation anyway
+ by clicking <strong>Install All</strong>. </li>
+ <li>Restart Eclipse. </li>
+</ol>
+
+</td>
+<td>
+
+<ol>
+ <li>Start Eclipse, then select <strong>Help</strong> &gt; <strong>Software Updates...</strong>.
+ </li>
+ <li>In the dialog that appears, click the <strong>Available Software</strong> tab.
+ </li>
+ <li>Click <strong>Add Site...</strong>
+ </li>
+ <li>Enter this as the Location:
+ <pre>https://dl-ssl.google.com/android/eclipse/</pre>
+ <p>Alternatively, you can use http in the Location URL, if you are having
+ trouble with https (https is preferred for security reasons).</p>
+ <pre>http://dl-ssl.google.com/android/eclipse/</pre>
+ <p>Click <strong>OK</strong>.</p></li>
+ <li>Back in the Available Software view, you should see the plugin. Select the checkbox next to
+ <em>Developer Tools</em> and click <strong>Install...</strong>
+ </li>
+ <li>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 <strong>Next</strong>.
+ </li>
+ <li>Accept the license agreement and click <strong>Finish</strong>.</li>
+ <li>Restart Eclipse. </li>
+</ol>
+
+</td>
+</tr>
+</table>
+
+
+<p>Now, you just need to modify your Eclipse preferences to point to the Android SDK directory:</p>
<ol>
<li>Select <strong>Window</strong> &gt; <strong>Preferences...</strong> to open the Preferences
panel. (Mac OS X: <strong>Eclipse</strong> &gt; <strong>Preferences</strong>) </li>
@@ -58,16 +132,55 @@ to use the Android SDK.</p>
<li>For the SDK Location in the main panel, click <strong>Browse...</strong> and locate the SDK directory. </li>
<li>Click <strong>Apply</strong>, then <strong>OK</strong>.</li>
</ol>
-<p>Done! We now recommend that you install the ADT Eclipse plugin, which will provide some much-appreciated assistance in developing Android apps with Eclipse...</p>
-<a name="installingplugin"></a>
-<h2>Installing the Eclipse Plugin (ADT)</h2>
+<p>Done! If you haven't encountered any problems, then you're ready to begin developing Android applications.
+We recommend you begin with the <a href="{@docRoot}guide/tutorials/hello-world.html">Hello World</a> tutorial,
+which will teach you some basics about Android applications and how to create projects using Eclipse.</p>
-<p>If you will be using the Eclipse IDE as your environment for developing Android applications, you can install a custom plugin called Android Development Tools (ADT), which adds integrated support for Android projects and tools. The ADT plugin includes a variety of powerful extensions that make creating, running, and debugging Android applications faster and easier. This plugin is highly recommended for Eclipse users.</p>
-<p>If you <em>will not</em> be using the Eclipse IDE, you do not need to download or install the ADT plugin.</p>
+<h3 id="troubleshooting">Troubleshooting ADT Installation</h3>
+<p>
+If you are having trouble downloading the ADT plugin after following the steps above, here are some suggestions: </p>
-<p><strong>Follow this guide to install the ADT Plugin</strong></p>
+<ul>
+ <li>If Eclipse can not find the remote update site containing the ADT plugin, try changing the remote site URL to use http, rather than https. That is, set the Location for the remote site to:
+ <pre>http://dl-ssl.google.com/android/eclipse/</pre></li>
+ <li>If you are behind a firewall (such as a corporate firewall), make
+ sure that you have properly configured your proxy settings in Eclipse.
+ In Eclipse 3.3/3.4, you can configure proxy information from the main
+ Eclipse menu in <strong>Window</strong> (on Mac, <strong>Eclipse</strong>) &gt; <strong>Preferences</strong> &gt; <strong>General</strong> &gt; <strong>Network Connections</strong>.</li>
+</ul>
+<p>
+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:
+</p>
+<ol>
+<li><a href="{@docRoot}sdk/adt_download.html">Download the ADT zip file</a> (do not unpack it).
+<li>Follow steps 1 and 2 in the default install instructions (above).
+<li>In Eclipse 3.3, click <strong>New Archive Site...</strong>. <br/>
+ In Eclipse 3.4, click <strong>Add Site...</strong>, then <strong>Archive...</strong>
+<li>Browse and select the downloaded the zip file.
+<li>Follow the remaining procedures, above, starting from steps 5.
+</ol>
+<p>
+Note that to update your plugin, you will have to follow these steps again instead of the default update instructions.</p>
+
+<p>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
+<a href="{@docRoot}guide/appendix/faq/troubleshooting.html#installeclipsecomponents">ADT Installation Error: "requires plug-in org.eclipse.wst.sse.ui"</a>.</p>
+
+<h4>For Linux users</h4>
+<p>If you encounter this error when installing the ADT Plugin for Eclipse:
+<pre>
+An error occurred during provisioning.
+Cannot connect to keystore.
+JKS</pre>
+<p>
+...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.</p>
<a name="installnotes"></a>
<h2>Installation Notes</h2>
@@ -106,19 +219,3 @@ at the top of this page. In particular, note that some Linux
distributions may include JDK 1.4 or Gnu Compiler for Java, both of
which are not supported for Android development.</li>
</ul>
-
-<a name="developingwitheclipse"></a>
-<a name="existingcode"></a>
-<a name="creatingaproject" id="creatingaproject"></a>
-<a name="launchconfig" id="launchconfig"></a>
-<a name="installingrunningdebugging" id="installingrunningdebugging"></a>
-<a name="otherides" id="otherides"></a>
-<a name="buildingwithant"></a>
-<a name="debugging" id="debugging"></a>
-<a name="additionaldebugging" id="additionaldebugging"></a>
-<a name="toptips" id="toptips"></a>
-<a name="debughelpers"></a>
-<a name="uninstalling" id="uninstalling"></a>
-<a name="tips" id="tips"></a>
-<a name="eclipse" id="eclipse"></a>
-<a name="building"></a>
diff --git a/docs/html/sdk/1.0_r1/upgrading.jd b/docs/html/sdk/1.0_r1/upgrading.jd
index 168f1be..480bff3 100644
--- a/docs/html/sdk/1.0_r1/upgrading.jd
+++ b/docs/html/sdk/1.0_r1/upgrading.jd
@@ -1,37 +1,12 @@
page.title=Upgrading the SDK
+sdk.version=1.0_r1
@jd:body
-<div class="sidebox-wrapper">
- <div class="sidebox-inner">
-
- <h2>Useful Links</h2>
-
- <ul class="noindent">
- <li><a href="migrating/0.9-1.0/changes-overview.html">Overview of Changes</a>
- <p>A high-level look at what's changed in Android, with
- discussion of how the changes may affect your apps.</p></li>
-
- <li><a href="migrating/0.9-1.0/changes.html">API Diff Report</a>
- <p>A detailed report that lists all the specific changes in the latest SDK.</p></li>
-
- <li><a href="RELEASENOTES.html">Release Notes</a>
- <p>Version details, known issues, and resolved issues. </p></li>
-
- <li><a href="http://groups.google.com/group/android-developers">Android Developers Group</a>
- <p>A forum where you can discuss migration issues and learn from other Android developers. </p></li>
-
- <li><a href="http://code.google.com/p/android/issues/list">Android Issue Tracker</a>
- <p>If you think you may have found a bug, use the issue tracker to report it.</p></li>
- </ul>
-
- </div>
-</div><!-- class-sidebox -->
-
+<p>For the current SDK release, see the links under <strong>Current SDK Release</strong> in the side navigation.</p>
<p>This guide will help you migrate your development environment and applications
-to the latest version of the SDK. Use this guide if you've been developing applications
-on a previous version of the Android SDK.
-</p>
+to <strong>version 1.0, release 1</strong>, of the Android SDK. Use this guide if you've been developing applications
+on a different version of the Android SDK.</p>
<p>To ensure that your applications are compliant with the Android 1.0 system available
on mobile devices, you need to install the new SDK and port your existing Android
@@ -39,9 +14,7 @@ applications to the updated API. The sections below guide you through the proces
<h2 id="install-new">Install the new SDK</h2>
-<p><a href="{@docRoot}download.html">Download the SDK</a> and unpack it into a safe location.</p>
-
-<p>After unpacking the new SDK, you should:</p>
+<p>After unpacking the SDK, you should:</p>
<ul>
<li>Wipe your emulator data. <p>Some data formats have changed since the last
@@ -60,27 +33,58 @@ applications to the updated API. The sections below guide you through the proces
<h2 id="update-plugin">Update your ADT Eclipse Plugin</h2>
-<p>If you develop on Eclipse and are using the ADT plugin, follow these steps to install the new plugin that accompanies the latest SDK.</p>
+<p>If you develop on Eclipse and are using the ADT plugin, follow these steps to install the
+plugin that's required for this version of the SDK.</p>
<table style="font-size:100%">
<tr><th>Eclipse 3.3 (Europa)</th><th>Eclipse 3.4 (Ganymede)</th></tr>
<tr>
-<td width="50%">
+<td width="45%">
<ol>
- <li> Select <strong>Help</strong> &gt; <strong>Software Updates</strong> &gt; <strong>Find and Install...</strong>. </li>
- <li> Select <strong>Search for updates of the currently installed features</strong> and click <strong>Finish</strong>. </li>
- <li> If any update for ADT is available, select and install. </li>
- <li> Restart Eclipse.</li>
+ <li><a href="http://dl-ssl.google.com/android/ADT-0.8.0.zip">Download the ADT v0.8.0 zip
+ file</a> (do not unpack it).</li>
+ <li>Start Eclipse, then select <strong>Help</strong> &gt; <strong>Software Updates</strong> &gt; <strong>Find
+ and Install...</strong>. </li>
+ <li>In the dialog that appears, select <strong>Search for new features to install</strong> and click
+ <strong>Next</strong>. </li>
+ <li>Click <strong>New Archive Site...</strong></li>
+ <li>Browse and select the downloaded the zip file.</li>
+ <li>You should now see the new site added to the search list (and checked).
+ Click <strong>Finish</strong>. </li>
+ <li>In the subsequent Search Results dialog box, select the checkbox for
+ <strong>Android Plugin</strong> &gt; <strong>Developer Tools</strong>.
+ 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 <strong>Next</strong>. </li>
+ <li>Read the license agreement and then select <strong>Accept terms of the license agreement</strong>.
+ Click <strong>Next</strong>. </li>
+ <li>Click <strong>Finish</strong>. </li>
+ <li>The ADT plugin is not signed; you can accept the installation anyway
+ by clicking <strong>Install All</strong>. </li>
+ <li>Restart Eclipse. </li>
</ol>
+
</td>
<td>
+
<ol>
- <li>Select <strong>Help</strong> &gt; <strong>Software Updates...</strong></li>
- <li>Select the <strong>Installed Software</strong> tab.</li>
- <li>Click <strong>Update...</strong></li>
- <li>If an update for ADT is available, select it and click <strong>Finish</strong>.</li>
- <li>Restart Eclipse.</li>
+ <li><a href="http://dl-ssl.google.com/android/ADT-0.8.0.zip">Download the ADT v0.8.0 zip
+ file</a> (do not unpack it).</li>
+ <li>Start Eclipse, then select <strong>Help</strong> &gt; <strong>Software Updates...</strong>.</li>
+ <li>In the dialog that appears, click the <strong>Available Software</strong> tab.</li>
+ <li>Click <strong>Add Site...</strong>, then <strong>Archive...</strong>.</li>
+ <li>Browse and select the downloaded the zip file.</li>
+ <li>Back in the Available Software view, you should see the plugin. Select the checkbox next to
+ <em>Developer Tools</em> and click <strong>Install...</strong></li>
+ <li>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 <strong>Next</strong>.</li>
+ <li>Accept the license agreement and click <strong>Finish</strong>.</li>
+ <li>Restart Eclipse. </li>
</ol>
+
</td>
</tr>
</table>
@@ -99,7 +103,7 @@ applications to the updated API. The sections below guide you through the proces
the ADT plugin and the Ant-based build tools support this requirement by signing compiled
.apk files with a debug key. To do so, the build tools use the Keytool utility included
in the JDK to to create a keystore and a key with a known alias and password. For more
-information, see <a href="{@docRoot}guide/publishing/app-signing.html">Signing Your Applications</a>.
+information, see "Signing and Publishing Your App" in the documentation included with the SDK.
<p>To support signing, you should first make sure that Keytool is available to the SDK build
tools. In most cases, you can tell the SDK build tools how to find Keytool by making sure that
@@ -133,10 +137,7 @@ to place 3rd jar files, which are now automatically handled by the Ant script.</
framework and API changes. You'll need to update your code to match changes in the Android APIs.</p>
<p>One way to start is to open your project in Eclipse and see where the ADT
-identifies errors in your application. From there, you can lookup
-respective changes in the
-<a href="migrating/changes-overview.html">Overview of Changes</a>
-and <a href="migrating/changes.html">API Diffs Report</a>.</p>
+identifies errors in your application.</p>
<p>If you have additional trouble updating your code, visit the
<a href="http://groups.google.com/group/android-developers">Android Developers Group</a>
@@ -144,8 +145,4 @@ to seek help from other Android developers.</p>
<p>If you have modified one of the ApiDemos applications and would like to migrate it
to the new SDK, note that you will need to uninstall the version of ApiDemos that comes
-preinstalled in the emulator. For more information, or if you encounter an "reinstallation"
-error when running or installing ApiDemos, see the troubleshooting topic
-<a href="{@docRoot}guide/appendix/faq/troubleshooting.html#apidemosreinstall">I can't install ApiDemos
-apps in my IDE because of a signing error</a> for information about how to solve the problem.</p>
-
+preinstalled in the emulator.</p>
diff --git a/docs/html/sdk/1.0_r2/index.jd b/docs/html/sdk/1.0_r2/index.jd
index 6fbca6d..2446c09 100644
--- a/docs/html/sdk/1.0_r2/index.jd
+++ b/docs/html/sdk/1.0_r2/index.jd
@@ -22,43 +22,44 @@ sdk.linux_checksum=a1f3b6d854596f850f5008856d0f380e
<h2>Included in this SDK</h2>
-<p>This SDK includes some awesome stuff.</p>
-
-
-<h2>System and Software Requirements</h2>
-
-<p>The following systems and development environments are supported by this SDK.</p>
-
-<h4>Supported Operating Systems:</h4>
-<ul>
- <li>Windows XP or Vista</li>
- <li>Mac OS X 10.4.8 or later (x86 only)</li>
- <li>Linux (tested on Linux Ubuntu Dapper Drake)</li>
-</ul>
-
-<h4>Supported Development Environments:</h4>
-<ul>
- <li>Eclipse IDE
- <ul>
- <li><a href="http://www.eclipse.org/downloads/">Eclipse</a> 3.3 (Europa), 3.4 (Ganymede)
- <ul>
- <li>Eclipse <a href="http://www.eclipse.org/jdt">JDT</a> plugin (included in most Eclipse IDE packages) </li>
- <li><a href="http://www.eclipse.org/webtools">WST</a> (optional, but needed for the Android Editors feature; included in <a href="http://www.eclipse.org/downloads/moreinfo/compare.php">most Eclipse IDE packages</a>)</li>
- </ul>
- </li>
- <li><a href="http://java.sun.com/javase/downloads/index.jsp">JDK 5 or JDK 6</a> (JRE alone is not sufficient)</li>
- <li><a href="installing.html#installingplugin">Android Development Tools plugin</a> (optional)</li>
- <li><strong>Not</strong> compatible with Gnu Compiler for Java (gcj)</li>
- </ul>
- </li>
- <li>Other development environments or IDEs
- <ul>
- <li><a href="http://java.sun.com/javase/downloads/index.jsp">JDK 5 or JDK 6</a> (JRE alone is not sufficient)</li>
- <li><a href="http://ant.apache.org/">Apache Ant</a> 1.6.5 or later for Linux and Mac, 1.7 or later for Windows</li>
- <li><strong>Not</strong> compatible with Gnu Compiler for Java (gcj)</li>
- </ul>
- </li>
-</ul>
-
-<p class="note"><strong>Note:</strong> If JDK is already installed on your development computer, please take a moment to make sure that it meets the version requirements listed above. In
-particular, note that some Linux distributions may include JDK 1.4 or Gnu Compiler for Java, both of which are not supported for Android development. </p> \ No newline at end of file
+<h4>Development tools</h4>
+
+<p>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 documentation included with the SDK.
+You can access the tools in the <code>&lt;sdk&gt;/tools/</code> directory.</p>
+
+<h4 id="system_images">System Images</h4>
+
+<p>The Android system images listed below are included in this SDK.</p>
+
+<table style="margin-right:1em;" width="80%">
+<tr>
+<th><nobr>System Image</nobr></th><th><nobr>API Level</nobr></th><th>Notes</th><th>Description</th>
+</tr>
+
+<tr>
+<td width="5%"><nobr>Android 1.0</nobr></td>
+<td width="5%">1</td>
+<td width="5%"><nobr>N/A</nobr></td>
+<td>Includes the {@code com.google.android.maps} external library and a set of standard development
+applications. </td>
+
+</tr>
+
+</table>
+
+<h4>Sample Code and Applications</h4>
+
+<p>You can look at a variety of tutorials and samples in the
+documentation included with the SDK and access the sample code itself
+in the <code>&lt;sdk&gt;/samples/</code> directory of the SDK package.</p>
+
+<h4>Documentation</h4>
+
+<p>The SDK package provides a full set of local documentation, including installation and upgrade
+instructions. To view it, open the <code>&lt;sdk&gt;/documentation.html</code> file in a web browser.
+If you are developing in an IDE such as Eclipse, you can also view the reference documentation
+directly in the IDE. </p>
+
+
+
diff --git a/docs/html/sdk/1.0_r2/installing.jd b/docs/html/sdk/1.0_r2/installing.jd
index 0f15396..2c58dfd 100644
--- a/docs/html/sdk/1.0_r2/installing.jd
+++ b/docs/html/sdk/1.0_r2/installing.jd
@@ -1,29 +1,27 @@
page.title=Installing the SDK
+sdk.version=1.0_r2
@jd:body
+<p>For the current SDK release, see the links under <strong>Current SDK Release</strong> in the side navigation.</p>
-<p>This page describes how to install the Android SDK and set up your development environment. If you haven't
-downloaded the SDK yet, follow the link below.</p>
+<p>This page describes how to install the Android 1.0 SDK, Release 2, and set up your development environment.
+If you haven't downloaded the SDK yet, you can so from the <a href="{@docRoot}sdk/1.0_r2/index.html">Download</a> page.</p>
-<div class="linkbox"><a href="http://developer.android.com/sdk/">Download the SDK</a></div>
+<p>Before you begin, be sure that your development environment meets the SDK
+<a href="{@docRoot}sdk/1.0_r2/requirements.html">System Requirements</a>. If you encounter any problems during installation,
+see the <a href="#installnotes">Installation Notes</a> at the bottom of this page.</p>
-<p>Before you begin, be sure that you're development environment meets the SDK
-<a href="requirements.html">System and Software Requirements</a>.</p>
-
-<div class="special">
<h4 style="margin-top">Upgrading?</h4>
<p>If you have already developed applications using an earlier version of the
SDK, please skip this page and read the
-<b><a href="upgrading.html">Upgrading the SDK</a></b> document.
+<a href="{@docRoot}sdk/1.0_r2/upgrading.html"><strong>Upgrading the SDK</strong></a></b> document instead.
</p>
-</div>
-
<a name="installingsdk"></a>
<a name="setup"></a>
<h2>Installing the SDK</h2>
- <p>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 <code>android_sdk_<em>&lt;platform</em>&gt;_<em>&lt;release&gt;</em>_<em>&lt;build&gt;</em></code>. The directory contains the subdirectories <code>tools/</code>, <code>samples/</code>, and others. </p>
+ <p>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 <code>android_sdk_<em>&lt;platform</em>&gt;_<em>&lt;release&gt;</em>_<em>&lt;build&gt;</em></code>. The directory contains a link to a local copy of the documentation and the subdirectories <code>tools/</code>, <code>samples/</code>, and others. </p>
<p>Make a note of the name and location of the unpacked SDK directory on your system &mdash; you will need to refer to the SDK directory later, when setting up the Android plugin or using SDK tools. </p>
@@ -47,10 +45,86 @@ SDK, please skip this page and read the
<p>Adding <code>tools</code> to your path lets you run Android Debug Bridge (adb) and the other command line <a href="{@docRoot}guide/developing/tools/index.html">tools</a> 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.</p>
-<h3>Setting up Eclipse</h3>
-<p>If you'll be developing with the Eclipse IDE, follow the following procedure to setup the IDE
-to use the Android SDK.</p>
-<p>Basically, you just need to update your Eclipse preferences to point to the Android SDK directory:</p>
+
+<p>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 setup Eclipse. If you choose not to use Eclipse, you can
+develop Android applications using other tools &mdash; read the guide to developing
+<a href="{@docRoot}guide/developing/other-ide.html">In other IDEs</a>.</p>
+
+
+<h2>Setting up Eclipse</h2>
+
+<p>First, you should install a custom plugin called Android Development Tools (ADT), which adds integrated support for Android projects and tools. The ADT plugin includes a variety of powerful extensions that make creating, running, and debugging Android applications faster and easier. Developing in ADT/Eclipse is highly recommended for Eclipse users and those new to Android.</p>
+
+<p>To download and install the ADT plugin, follow the steps below for your respective Eclipse version. </p>
+
+<table style="font-size:100%">
+<tr><th>Eclipse 3.3 (Europa)</th><th>Eclipse 3.4 (Ganymede)</th></tr>
+<tr>
+<td width="45%">
+<ol>
+ <li>Start Eclipse, then select <strong>Help</strong> &gt; <strong>Software Updates</strong> &gt; <strong>Find
+ and Install...</strong>. </li>
+
+ <li>In the dialog that appears, select <strong>Search for new features to install</strong> and click <strong>Next</strong>. </li>
+ <li>Click <strong>New Remote Site</strong>. </li>
+ <li>In the resulting dialog box, enter a name for the remote site (e.g. Android Plugin) and enter this as its URL:
+ <pre>https://dl-ssl.google.com/android/eclipse/</pre>
+ <p>Alternatively, you can use http in the Location URL, if you are having
+ trouble with https (https is preferred for security reasons).</p>
+ <pre>http://dl-ssl.google.com/android/eclipse/</pre>
+ <p>Click <strong>OK</strong>.</p> </li>
+ <li>You should now see the new site added to the search list (and checked).
+ Click <strong>Finish</strong>. </li>
+ <li>In the subsequent Search Results dialog box, select the checkbox for
+ <strong>Android Plugin</strong> &gt; <strong>Developer Tools</strong>.
+ 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 <strong>Next</strong>. </li>
+ <li>Read the license agreement and then select <strong>Accept terms of the license agreement</strong>.
+ Click <strong>Next</strong>. </li>
+ <li>Click <strong>Finish</strong>. </li>
+
+ <li>The ADT plugin is not signed; you can accept the installation anyway
+ by clicking <strong>Install All</strong>. </li>
+ <li>Restart Eclipse. </li>
+</ol>
+
+</td>
+<td>
+
+<ol>
+ <li>Start Eclipse, then select <strong>Help</strong> &gt; <strong>Software Updates...</strong>.
+ </li>
+ <li>In the dialog that appears, click the <strong>Available Software</strong> tab.
+ </li>
+ <li>Click <strong>Add Site...</strong>
+ </li>
+ <li>Enter this as the Location:
+ <pre>https://dl-ssl.google.com/android/eclipse/</pre>
+ <p>Alternatively, you can use http in the Location URL, if you are having
+ trouble with https (https is preferred for security reasons).</p>
+ <pre>http://dl-ssl.google.com/android/eclipse/</pre>
+ <p>Click <strong>OK</strong>.</p></li>
+ <li>Back in the Available Software view, you should see the plugin. Select the checkbox next to
+ <em>Developer Tools</em> and click <strong>Install...</strong>
+ </li>
+ <li>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 <strong>Next</strong>.
+ </li>
+ <li>Accept the license agreement and click <strong>Finish</strong>.</li>
+ <li>Restart Eclipse. </li>
+</ol>
+
+</td>
+</tr>
+</table>
+
+
+<p>Now, you just need to modify your Eclipse preferences to point to the Android SDK directory:</p>
<ol>
<li>Select <strong>Window</strong> &gt; <strong>Preferences...</strong> to open the Preferences
panel. (Mac OS X: <strong>Eclipse</strong> &gt; <strong>Preferences</strong>) </li>
@@ -58,16 +132,55 @@ to use the Android SDK.</p>
<li>For the SDK Location in the main panel, click <strong>Browse...</strong> and locate the SDK directory. </li>
<li>Click <strong>Apply</strong>, then <strong>OK</strong>.</li>
</ol>
-<p>Done! We now recommend that you install the ADT Eclipse plugin, which will provide some much-appreciated assistance in developing Android apps with Eclipse...</p>
-<a name="installingplugin"></a>
-<h2>Installing the Eclipse Plugin (ADT)</h2>
+<p>Done! If you haven't encountered any problems, then you're ready to begin developing Android applications.
+We recommend you begin with the <a href="{@docRoot}guide/tutorials/hello-world.html">Hello World</a> tutorial,
+which will teach you some basics about Android applications and how to create projects using Eclipse.</p>
-<p>If you will be using the Eclipse IDE as your environment for developing Android applications, you can install a custom plugin called Android Development Tools (ADT), which adds integrated support for Android projects and tools. The ADT plugin includes a variety of powerful extensions that make creating, running, and debugging Android applications faster and easier. This plugin is highly recommended for Eclipse users.</p>
-<p>If you <em>will not</em> be using the Eclipse IDE, you do not need to download or install the ADT plugin.</p>
+<h3 id="troubleshooting">Troubleshooting ADT Installation</h3>
+<p>
+If you are having trouble downloading the ADT plugin after following the steps above, here are some suggestions: </p>
-<p><strong>Follow this guide to install the ADT Plugin</strong></p>
+<ul>
+ <li>If Eclipse can not find the remote update site containing the ADT plugin, try changing the remote site URL to use http, rather than https. That is, set the Location for the remote site to:
+ <pre>http://dl-ssl.google.com/android/eclipse/</pre></li>
+ <li>If you are behind a firewall (such as a corporate firewall), make
+ sure that you have properly configured your proxy settings in Eclipse.
+ In Eclipse 3.3/3.4, you can configure proxy information from the main
+ Eclipse menu in <strong>Window</strong> (on Mac, <strong>Eclipse</strong>) &gt; <strong>Preferences</strong> &gt; <strong>General</strong> &gt; <strong>Network Connections</strong>.</li>
+</ul>
+<p>
+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:
+</p>
+<ol>
+<li><a href="{@docRoot}sdk/adt_download.html">Download the ADT zip file</a> (do not unpack it).
+<li>Follow steps 1 and 2 in the default install instructions (above).
+<li>In Eclipse 3.3, click <strong>New Archive Site...</strong>. <br/>
+ In Eclipse 3.4, click <strong>Add Site...</strong>, then <strong>Archive...</strong>
+<li>Browse and select the downloaded the zip file.
+<li>Follow the remaining procedures, above, starting from steps 5.
+</ol>
+<p>
+Note that to update your plugin, you will have to follow these steps again instead of the default update instructions.</p>
+
+<p>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
+<a href="{@docRoot}guide/appendix/faq/troubleshooting.html#installeclipsecomponents">ADT Installation Error: "requires plug-in org.eclipse.wst.sse.ui"</a>.</p>
+
+<h4>For Linux users</h4>
+<p>If you encounter this error when installing the ADT Plugin for Eclipse:
+<pre>
+An error occurred during provisioning.
+Cannot connect to keystore.
+JKS</pre>
+<p>
+...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.</p>
<a name="installnotes"></a>
<h2>Installation Notes</h2>
@@ -106,19 +219,3 @@ at the top of this page. In particular, note that some Linux
distributions may include JDK 1.4 or Gnu Compiler for Java, both of
which are not supported for Android development.</li>
</ul>
-
-<a name="developingwitheclipse"></a>
-<a name="existingcode"></a>
-<a name="creatingaproject" id="creatingaproject"></a>
-<a name="launchconfig" id="launchconfig"></a>
-<a name="installingrunningdebugging" id="installingrunningdebugging"></a>
-<a name="otherides" id="otherides"></a>
-<a name="buildingwithant"></a>
-<a name="debugging" id="debugging"></a>
-<a name="additionaldebugging" id="additionaldebugging"></a>
-<a name="toptips" id="toptips"></a>
-<a name="debughelpers"></a>
-<a name="uninstalling" id="uninstalling"></a>
-<a name="tips" id="tips"></a>
-<a name="eclipse" id="eclipse"></a>
-<a name="building"></a>
diff --git a/docs/html/sdk/1.0_r2/requirements.jd b/docs/html/sdk/1.0_r2/requirements.jd
new file mode 100644
index 0000000..74d90ef
--- /dev/null
+++ b/docs/html/sdk/1.0_r2/requirements.jd
@@ -0,0 +1,44 @@
+page.title=System Requirements
+sdk.version=1.0_r2
+
+
+@jd:body
+
+<p>The sections below describe the system and software requirements for developing Android applications using the Android SDK tools included in Android 1.0 SDK, Release 2. </p>
+
+<h2>System and Software Requirements</h2>
+<p>The following systems and development environments are supported by this SDK.</p>
+
+<h4>Supported Operating Systems:</h4>
+<ul>
+ <li>Windows XP or Vista</li>
+ <li>Mac OS X 10.4.8 or later (x86 only)</li>
+ <li>Linux (tested on Linux Ubuntu Dapper Drake)</li>
+</ul>
+
+<h4>Supported Development Environments:</h4>
+<ul>
+ <li>Eclipse IDE
+ <ul>
+ <li><a href="http://www.eclipse.org/downloads/">Eclipse</a> 3.3 (Europa), 3.4 (Ganymede)
+ <ul>
+ <li>Eclipse <a href="http://www.eclipse.org/jdt">JDT</a> plugin (included in most Eclipse IDE packages) </li>
+ <li><a href="http://www.eclipse.org/webtools">WST</a> (optional, but needed for the Android Editors feature; included in <a href="http://www.eclipse.org/downloads/moreinfo/compare.php">most Eclipse IDE packages</a>)</li>
+ </ul>
+ </li>
+ <li><a href="http://java.sun.com/javase/downloads/index.jsp">JDK 5 or JDK 6</a> (JRE alone is not sufficient)</li>
+ <li><a href="installing.html#installingplugin">Android Development Tools plugin</a> (optional)</li>
+ <li><strong>Not</strong> compatible with Gnu Compiler for Java (gcj)</li>
+ </ul>
+ </li>
+ <li>Other development environments or IDEs
+ <ul>
+ <li><a href="http://java.sun.com/javase/downloads/index.jsp">JDK 5 or JDK 6</a> (JRE alone is not sufficient)</li>
+ <li><a href="http://ant.apache.org/">Apache Ant</a> 1.6.5 or later for Linux and Mac, 1.7 or later for Windows</li>
+ <li><strong>Not</strong> compatible with Gnu Compiler for Java (gcj)</li>
+ </ul>
+ </li>
+</ul>
+
+<p class="note"><strong>Note:</strong> If JDK is already installed on your development computer, please take a moment to make sure that it meets the version requirements listed above. In
+particular, note that some Linux distributions may include JDK 1.4 or Gnu Compiler for Java, both of which are not supported for Android development. </p> \ No newline at end of file
diff --git a/docs/html/sdk/1.0_r2/upgrading.jd b/docs/html/sdk/1.0_r2/upgrading.jd
index 168f1be..df9b657 100644
--- a/docs/html/sdk/1.0_r2/upgrading.jd
+++ b/docs/html/sdk/1.0_r2/upgrading.jd
@@ -1,37 +1,12 @@
page.title=Upgrading the SDK
+sdk.version=1.0_r2
@jd:body
-<div class="sidebox-wrapper">
- <div class="sidebox-inner">
-
- <h2>Useful Links</h2>
-
- <ul class="noindent">
- <li><a href="migrating/0.9-1.0/changes-overview.html">Overview of Changes</a>
- <p>A high-level look at what's changed in Android, with
- discussion of how the changes may affect your apps.</p></li>
-
- <li><a href="migrating/0.9-1.0/changes.html">API Diff Report</a>
- <p>A detailed report that lists all the specific changes in the latest SDK.</p></li>
-
- <li><a href="RELEASENOTES.html">Release Notes</a>
- <p>Version details, known issues, and resolved issues. </p></li>
-
- <li><a href="http://groups.google.com/group/android-developers">Android Developers Group</a>
- <p>A forum where you can discuss migration issues and learn from other Android developers. </p></li>
-
- <li><a href="http://code.google.com/p/android/issues/list">Android Issue Tracker</a>
- <p>If you think you may have found a bug, use the issue tracker to report it.</p></li>
- </ul>
-
- </div>
-</div><!-- class-sidebox -->
-
+<p>For the current SDK release, see the links under <strong>Current SDK Release</strong> in the side navigation.</p>
<p>This guide will help you migrate your development environment and applications
-to the latest version of the SDK. Use this guide if you've been developing applications
-on a previous version of the Android SDK.
-</p>
+to <strong>version 1.0, release 2</strong>, of the Android SDK. Use this guide if you've been developing applications
+on a different version of the Android SDK.</p>
<p>To ensure that your applications are compliant with the Android 1.0 system available
on mobile devices, you need to install the new SDK and port your existing Android
@@ -39,9 +14,7 @@ applications to the updated API. The sections below guide you through the proces
<h2 id="install-new">Install the new SDK</h2>
-<p><a href="{@docRoot}download.html">Download the SDK</a> and unpack it into a safe location.</p>
-
-<p>After unpacking the new SDK, you should:</p>
+<p>After unpacking the SDK, you should:</p>
<ul>
<li>Wipe your emulator data. <p>Some data formats have changed since the last
@@ -60,27 +33,58 @@ applications to the updated API. The sections below guide you through the proces
<h2 id="update-plugin">Update your ADT Eclipse Plugin</h2>
-<p>If you develop on Eclipse and are using the ADT plugin, follow these steps to install the new plugin that accompanies the latest SDK.</p>
+<p>If you develop on Eclipse and are using the ADT plugin, follow these steps to install the
+plugin that's required for this version of the SDK.</p>
<table style="font-size:100%">
<tr><th>Eclipse 3.3 (Europa)</th><th>Eclipse 3.4 (Ganymede)</th></tr>
<tr>
-<td width="50%">
+<td width="45%">
<ol>
- <li> Select <strong>Help</strong> &gt; <strong>Software Updates</strong> &gt; <strong>Find and Install...</strong>. </li>
- <li> Select <strong>Search for updates of the currently installed features</strong> and click <strong>Finish</strong>. </li>
- <li> If any update for ADT is available, select and install. </li>
- <li> Restart Eclipse.</li>
+ <li><a href="http://dl-ssl.google.com/android/ADT-0.8.0.zip">Download the ADT v0.8.0 zip
+ file</a> (do not unpack it).</li>
+ <li>Start Eclipse, then select <strong>Help</strong> &gt; <strong>Software Updates</strong> &gt; <strong>Find
+ and Install...</strong>. </li>
+ <li>In the dialog that appears, select <strong>Search for new features to install</strong> and click
+ <strong>Next</strong>. </li>
+ <li>Click <strong>New Archive Site...</strong></li>
+ <li>Browse and select the downloaded the zip file.</li>
+ <li>You should now see the new site added to the search list (and checked).
+ Click <strong>Finish</strong>. </li>
+ <li>In the subsequent Search Results dialog box, select the checkbox for
+ <strong>Android Plugin</strong> &gt; <strong>Developer Tools</strong>.
+ 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 <strong>Next</strong>. </li>
+ <li>Read the license agreement and then select <strong>Accept terms of the license agreement</strong>.
+ Click <strong>Next</strong>. </li>
+ <li>Click <strong>Finish</strong>. </li>
+ <li>The ADT plugin is not signed; you can accept the installation anyway
+ by clicking <strong>Install All</strong>. </li>
+ <li>Restart Eclipse. </li>
</ol>
+
</td>
<td>
+
<ol>
- <li>Select <strong>Help</strong> &gt; <strong>Software Updates...</strong></li>
- <li>Select the <strong>Installed Software</strong> tab.</li>
- <li>Click <strong>Update...</strong></li>
- <li>If an update for ADT is available, select it and click <strong>Finish</strong>.</li>
- <li>Restart Eclipse.</li>
+ <li><a href="http://dl-ssl.google.com/android/ADT-0.8.0.zip">Download the ADT v0.8.0 zip
+ file</a> (do not unpack it).</li>
+ <li>Start Eclipse, then select <strong>Help</strong> &gt; <strong>Software Updates...</strong>.</li>
+ <li>In the dialog that appears, click the <strong>Available Software</strong> tab.</li>
+ <li>Click <strong>Add Site...</strong>, then <strong>Archive...</strong>.</li>
+ <li>Browse and select the downloaded the zip file.</li>
+ <li>Back in the Available Software view, you should see the plugin. Select the checkbox next to
+ <em>Developer Tools</em> and click <strong>Install...</strong></li>
+ <li>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 <strong>Next</strong>.</li>
+ <li>Accept the license agreement and click <strong>Finish</strong>.</li>
+ <li>Restart Eclipse. </li>
</ol>
+
</td>
</tr>
</table>
@@ -99,7 +103,7 @@ applications to the updated API. The sections below guide you through the proces
the ADT plugin and the Ant-based build tools support this requirement by signing compiled
.apk files with a debug key. To do so, the build tools use the Keytool utility included
in the JDK to to create a keystore and a key with a known alias and password. For more
-information, see <a href="{@docRoot}guide/publishing/app-signing.html">Signing Your Applications</a>.
+information, see "Signing and Publishing Your App" in the documentation included with the SDK.
<p>To support signing, you should first make sure that Keytool is available to the SDK build
tools. In most cases, you can tell the SDK build tools how to find Keytool by making sure that
@@ -133,10 +137,7 @@ to place 3rd jar files, which are now automatically handled by the Ant script.</
framework and API changes. You'll need to update your code to match changes in the Android APIs.</p>
<p>One way to start is to open your project in Eclipse and see where the ADT
-identifies errors in your application. From there, you can lookup
-respective changes in the
-<a href="migrating/changes-overview.html">Overview of Changes</a>
-and <a href="migrating/changes.html">API Diffs Report</a>.</p>
+identifies errors in your application.</p>
<p>If you have additional trouble updating your code, visit the
<a href="http://groups.google.com/group/android-developers">Android Developers Group</a>
@@ -144,8 +145,4 @@ to seek help from other Android developers.</p>
<p>If you have modified one of the ApiDemos applications and would like to migrate it
to the new SDK, note that you will need to uninstall the version of ApiDemos that comes
-preinstalled in the emulator. For more information, or if you encounter an "reinstallation"
-error when running or installing ApiDemos, see the troubleshooting topic
-<a href="{@docRoot}guide/appendix/faq/troubleshooting.html#apidemosreinstall">I can't install ApiDemos
-apps in my IDE because of a signing error</a> for information about how to solve the problem.</p>
-
+preinstalled in the emulator.</p>
diff --git a/docs/html/sdk/1.1_r1/index.jd b/docs/html/sdk/1.1_r1/index.jd
index 7e70b6b..c4a9bf0 100644
--- a/docs/html/sdk/1.1_r1/index.jd
+++ b/docs/html/sdk/1.1_r1/index.jd
@@ -4,16 +4,16 @@ sdk.version=1.1_r1
sdk.date=February 2009
sdk.win_download=android-sdk-windows-1.1_r1.zip
-sdk.win_bytes=84533935
-sdk.win_checksum=4cec82e3d2c1658d73182e543d130a06
+sdk.win_bytes=86038515
+sdk.win_checksum=8c4b9080b430025370689e03d20842f3
sdk.mac_download=android-sdk-mac_x86-1.1_r1.zip
-sdk.mac_bytes=78918508
-sdk.mac_checksum=d67fb5f0eaf4f5a83dc985f5790940c6
+sdk.mac_bytes=79046151
+sdk.mac_checksum=becf0f1763d61eedce15d2a903d6c1dd
sdk.linux_download=android-sdk-linux_x86-1.1_r1.zip
-sdk.linux_bytes=79219171
-sdk.linux_checksum=df88091c9f0ef6cc56cd92afcdad8d56
+sdk.linux_bytes=79345522
+sdk.linux_checksum=ebcb16b0cd4aef198b4dd9a1418efbf1
@jd:body
diff --git a/docs/html/sdk/1.1_r1/installing.jd b/docs/html/sdk/1.1_r1/installing.jd
index b198800..d5a7106 100644
--- a/docs/html/sdk/1.1_r1/installing.jd
+++ b/docs/html/sdk/1.1_r1/installing.jd
@@ -4,22 +4,43 @@ sdk.version=1.1_r1
@jd:body
-<p>This page describes how to install the Android 1.1 SDK, Release 1, and set up your development environment.
-If you haven't downloaded the SDK yet, you can so from the <a href="{@docRoot}sdk/1.1_r1/index.html">Download</a> page.</p>
+<p>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
+<a href="{@docRoot}sdk/1.1_r1/index.html">Download</a> page.</p>
-<p>Before you begin, be sure that your development environment meets the SDK
-<a href="{@docRoot}sdk/1.1_r1/requirements.html">System Requirements</a>. If you encounter any problems during installation,
-see the <a href="#installnotes">Installation Notes</a> at the bottom of this page.</p>
+<p>If you encounter any problems during installation, see the
+<a href="#installnotes">Installation Notes</a> at the bottom of
+this page.</p>
<h4 style="margin-top">Upgrading?</h4>
-<p>If you have already developed applications using an earlier version of the
-SDK, please skip this page and read the
-<a href="{@docRoot}sdk/1.1_r1/upgrading.html"><strong>Upgrading the SDK</strong></a></b> document instead.
+<p>If you have already developed applications using an earlier version
+of the SDK, please skip this page and read the
+<a href="{@docRoot}sdk/1.1_r1/upgrading.html"><strong>Upgrading the
+SDK</strong></a></b> document instead.
</p>
-<a name="installingsdk"></a>
-<a name="setup"></a>
-<h2>Installing the SDK</h2>
+
+<h2 id="setup">Preparing for Installation</h2>
+
+<p>Before you get started with the Android SDK, take a moment to confirm
+that your development machine meets the <a
+href="{@docRoot}sdk/1.1_r1/requirements.html">system requirements</a>.
+</p>
+
+<p>If you will be developing on Eclipse with the Android Development
+Tools (ADT) Plugin &mdash; the recommended path if you are new to
+Android &mdash; 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: </p>
+
+<p style="margin-left:2em;"><a href=
+"http://www.eclipse.org/downloads/">http://www.eclipse.org/downloads/</a
+></p>
+
+<p>A Java or RCP version of Eclipse is recommended. </p>
+
+<h2 id="installingsdk">Installing the SDK</h2>
<p>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 <code>android_sdk_<em>&lt;platform</em>&gt;_<em>&lt;release&gt;</em>_<em>&lt;build&gt;</em></code>. The directory contains a link to a local copy of the documentation and the subdirectories <code>tools/</code>, <code>samples/</code>, and others. </p>
@@ -47,16 +68,34 @@ SDK, please skip this page and read the
<p>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 setup Eclipse. If you choose not to use Eclipse, you can
+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 &mdash; read the guide to developing
-<a href="{@docRoot}guide/developing/other-ide.html">In other IDEs</a>.</p>
+<a href="{@docRoot}guide/developing/other-ide.html">in other IDEs</a>.</p>
-<h2>Setting up Eclipse</h2>
+<h2 id="installingplugin">Installing the ADT Plugin for Eclipse</h2>
-<p>First, you should install a custom plugin called Android Development Tools (ADT), which adds integrated support for Android projects and tools. The ADT plugin includes a variety of powerful extensions that make creating, running, and debugging Android applications faster and easier. Developing in ADT/Eclipse is highly recommended for Eclipse users and those new to Android.</p>
+<p>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.</p>
-<p>To download and install the ADT plugin, follow the steps below for your respective Eclipse version. </p>
+<p>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.
+
+<p>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. </p>
+
+<p>Once you have Eclipse installed, as described in <a href="#setup">
+Preparing for Installation</a>, follow the steps below to
+download the ADT plugin and install it in your respective Eclipse
+environment. </p>
<table style="font-size:100%">
<tr><th>Eclipse 3.3 (Europa)</th><th>Eclipse 3.4 (Ganymede)</th></tr>
@@ -123,7 +162,6 @@ develop Android applications using other tools &mdash; read the guide to develop
</tr>
</table>
-
<p>Now, you just need to modify your Eclipse preferences to point to the Android SDK directory:</p>
<ol>
<li>Select <strong>Window</strong> &gt; <strong>Preferences...</strong> to open the Preferences
@@ -133,9 +171,9 @@ develop Android applications using other tools &mdash; read the guide to develop
<li>Click <strong>Apply</strong>, then <strong>OK</strong>.</li>
</ol>
-<p>Done! If you haven't encountered any problems, then you're ready to begin developing Android applications.
-We recommend you begin with the <a href="{@docRoot}guide/tutorials/hello-world.html">Hello World</a> tutorial,
-which will teach you some basics about Android applications and how to create projects using Eclipse.</p>
+<p>Done! If you haven't encountered any problems, then you're ready to
+begin developing Android applications. See the <a href="#next">After
+Installation: Next Steps</a> section for suggestions on how to start. </p>
<h3 id="troubleshooting">Troubleshooting ADT Installation</h3>
@@ -182,8 +220,59 @@ JKS</pre>
Java 6 will resolve this issue and you can then reinstall the ADT
Plugin.</p>
-<a name="installnotes"></a>
-<h2>Installation Notes</h2>
+
+<h2 id="next">After Installation: Next Steps</h2>
+<p>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: </p>
+
+<p><strong>Learn about Android</strong></p>
+<ul>
+<li>Take a look at the <a href="{@docRoot}guide/index.html">Dev
+Guide</a> and the types of information it provides</li>
+<li>Read an introduction to Android as a platform in <a
+href="{@docRoot}guide/basics/what-is-android.html">What is
+Android?</a></li>
+<li>Learn about the Android framework and how applications run on it in
+<a href="{@docRoot}guide/topics/fundamentals.html">Application
+Fundamentals</a></li>
+<li>Take a look at the Android framework API specification in the <a
+href="{@docRoot}reference/index.html">Reference</a> tab</li>
+</ul>
+
+<p><strong>Explore the SDK</strong></p>
+<ul>
+<li>Get an overview of the <a
+href="{@docRoot}guide/development/tools/index.html">development
+tools</a> that are available to you</li>
+<li>Read the overviews of how to develop <a
+href="{@docRoot}guide/developing/eclipse-adt.html">in Eclipse/ADT</a> or
+<a href="{@docRoot}guide/developing/other-ide.html">in other IDEs</a>
+</li>
+</ul>
+
+<p><strong>Explore some code</strong></p>
+<ul>
+<li>Set up a <a href="{@docRoot}guide/tutorials/hello-world.html">Hello
+World application</a></li>
+<li>Follow the <a href="{@docRoot}guide/tutorials/notepad/index.html">
+Notepad Tutorial</a> to build a full Android application </li>
+<li>Create a new project for one of the other sample applications
+included in <code>&lt;sdk&gt;/samples</code>, then compile and run it in
+your development environment</li>
+</ul>
+
+<p><strong>Visit the Android developer groups</strong></p>
+<ul>
+<li>Take a look at the <a
+href="{@docRoot}community/index.html">Community</a> tab to see a list of
+Android developers groups. In particular, you might want to look at the
+<a href="http://groups.google.com/group/android-developers">Android
+Developers</a> group to get a sense for what the Android developer
+community is like.</li>
+</ul>
+
+
+<h2 id="installnotes">Installation Notes</h2>
<h4>Ubuntu Linux Notes</h4>
<ul>
<li>If you need help installing and configuring Java on your
@@ -215,9 +304,9 @@ and the ADT plugin. </li>
<ul>
<li>If JDK is already installed on your development computer, please
take a moment to make sure that it meets the version requirements listed
-at the top of this page. In particular, note that some Linux
-distributions may include JDK 1.4 or Gnu Compiler for Java, both of
-which are not supported for Android development.</li>
+in the <a href="{@docRoot}sdk/1.1_r1/requirements.html">System Requirements</a>.
+In particular, note that some Linux distributions may include JDK 1.4 or Gnu
+Compiler for Java, both of which are not supported for Android development.</li>
</ul>
diff --git a/docs/html/sdk/sdk_toc.cs b/docs/html/sdk/sdk_toc.cs
index 688929f..76c1c84 100644
--- a/docs/html/sdk/sdk_toc.cs
+++ b/docs/html/sdk/sdk_toc.cs
@@ -1,26 +1,42 @@
<ul>
- <li>
- <?cs if:android.whichdoc != "online" ?><h2>Android 1.1 SDK, r1</h2>
- <?cs else ?><h2>Latest SDK Release</h2><?cs /if ?>
- <ul>
- <?cs if:android.whichdoc == "online" ?>
- <li><a href="<?cs var:toroot ?>sdk/1.1_r1/index.html">Download</a></li>
- <?cs /if ?>
+ <li><?cs
+ if:android.whichdoc != "online" ?>
+ <h2>Android 1.1 SDK, r1</h2><?cs
+ else ?>
+ <h2>Current SDK Release</h2><?cs
+ /if ?>
+ <ul><?cs
+ if:android.whichdoc == "online" ?>
+ <li><a href="<?cs var:toroot ?>sdk/1.1_r1/index.html">Download</a></li><?cs
+ /if ?>
<li><a href="<?cs var:toroot ?>sdk/1.1_r1/installing.html">Installing</a></li>
<li><a href="<?cs var:toroot ?>sdk/1.1_r1/upgrading.html">Upgrading</a></li>
<li><a href="<?cs var:toroot ?>sdk/1.1_r1/requirements.html">System Requirements</a></li>
- <li><a href="<?cs var:toroot ?>sdk/RELEASENOTES.html">SDK Release Notes</a></li>
</ul>
<ul>
+ <li><a href="<?cs var:toroot ?>sdk/terms.html">SDK Terms and Conditions</a></li>
+ <li><a href="<?cs var:toroot ?>sdk/RELEASENOTES.html">SDK Release Notes</a></li>
+ </ul><?cs
+ if:android.whichdoc == "online" ?>
+ <li>
+ <h2>Android System Images</h2>
+ <ul>
<li><a href="<?cs var:toroot ?>sdk/android-1.1.html">Android 1.1 Version Notes</a></li>
</ul>
</li>
-</ul>
-<ul>
- <li><a href="<?cs var:toroot ?>sdk/terms.html">SDK Terms and Conditions</a></li>
- <?cs if:android.whichdoc == "online" ?>
- <li><a href="http://code.google.com/android/download_list.html">Previous SDK Releases</a></li>
- <?cs /if ?>
+ <li>
+ <h2>Previous SDK Releases</h2>
+ <ul>
+ <li><a href="<?cs var:toroot ?>sdk/1.0_r2/index.html">Android 1.0 SDK, release 2</a></li>
+ <li><a href="<?cs var:toroot ?>sdk/1.0_r1/index.html">Android 1.0 SDK, release 1</a></li>
+ </ul>
+ </li><?cs
+ /if ?>
</ul>
+<script type="text/javascript">
+<!--
+ buildToggleLists();
+//-->
+</script> \ No newline at end of file