summaryrefslogtreecommitdiffstats
path: root/docs/html/tools
diff options
context:
space:
mode:
Diffstat (limited to 'docs/html/tools')
-rw-r--r--docs/html/tools/eclipse/index.jd37
-rw-r--r--docs/html/tools/help/adt.jd60
-rw-r--r--docs/html/tools/revisions/build-tools.jd3
-rw-r--r--docs/html/tools/revisions/platforms.jd43
-rw-r--r--docs/html/tools/revisions/studio.jd4
-rw-r--r--docs/html/tools/sdk/eclipse-adt.jd24
-rw-r--r--docs/html/tools/sdk/tools-notes.jd44
-rw-r--r--docs/html/tools/studio/index.jd24
-rw-r--r--docs/html/tools/tools_toc.cs25
-rw-r--r--docs/html/tools/workflow/index.jd8
10 files changed, 120 insertions, 152 deletions
diff --git a/docs/html/tools/eclipse/index.jd b/docs/html/tools/eclipse/index.jd
deleted file mode 100644
index c8a998b..0000000
--- a/docs/html/tools/eclipse/index.jd
+++ /dev/null
@@ -1,37 +0,0 @@
-page.title=Eclipse ADT
-@jd:body
-
-
-<div id="qv-wrapper">
-<div id="qv">
- <h2>See also</h2>
- <ol>
- <li><a href="{@docRoot}tools/sdk/index.html">Downloading Android Studio</a></li>
- <li><a href="{@docRoot}tools/studio/index.html">Android Studio</a></li>
- <li><a href="{@docRoot}tools/eclipse/migrate-adt.html">Migrating to Android Studio</a></li>
- </ol>
-</div>
-</div>
-
-
-<p>The Android Developer Tools (ADT) plugin for Eclipse provides a professional-grade development
-environment for building Android apps. It's a full Java IDE with advanced features to help you build,
-test, debug, and package your Android apps. </p>
-
-<p>Android developers are encouraged to <a href="{@docRoot}tools/eclipse/migrate-adt.html">migrate
-to Android Studio</a> as the Eclipse ADT is no longer in active development.
-</p>
-
-<p>The Android Studio build system replaces the Apache Ant build software used with Eclipse ADT
-with an Android plugin for <em>Gradle</em>. <a href="http://www.gradle.org/">Gradle</a> is an
-advanced build toolkit that manages dependencies and allows you to define custom build logic. Android
-Studio also adds support for Maven-based build dependencies, build variants, advanced code
-completion and refactoring. For more details about Android Studio, see the
-<a href="{@docRoot}tools/studio/index.html">Android Studio</a> guide.
-
-<p>If you still wish to get started with the ADT plugin,
-<a href="{@docRoot}tools/eclipse/installing-adt.html">download and install the Eclipse ADT plugin.</a>
-</p>
-
-</div>
-</div>
diff --git a/docs/html/tools/help/adt.jd b/docs/html/tools/help/adt.jd
index 1bb3015..0130524 100644
--- a/docs/html/tools/help/adt.jd
+++ b/docs/html/tools/help/adt.jd
@@ -24,63 +24,30 @@ page.tags=adt
</li>
<li><a href="#refactoring">Layout Factoring Support</a></li>
- <li><a href="#Updating">Updating the ADT Plugin</h2>
+ <li><a href="#Updating">Updating the ADT Plugin</a></li>
</ol>
-
- <h2>Related videos</h2>
-
- <ol>
- <li><a href="{@docRoot}videos/index.html#v=Oq05KqjXTvs">Android Developer Tools
- Google I/O Session</a>
- </li>
- </ol>
-
- <h2>See also</h2>
-
- <ol>
- <li><a href="http://tools.android.com/recent">Android Tools change blog</a></li>
- </ol>
</div>
</div>
<p>ADT (Android Developer Tools) is a plugin for Eclipse that provides a suite of
tools that are integrated with the Eclipse IDE. It offers you access to many features that help
- you develop Android applications quickly. ADT
+ you develop Android applications. ADT
provides GUI access to many of the command line SDK tools as well as a UI design tool for rapid
prototyping, designing, and building of your application's user interface.</p>
- <p>Because ADT is a plugin for Eclipse, you get the functionality of a well-established IDE,
- along with Android-specific features that are bundled with ADT. The following
- describes important features of Eclipse and ADT:</p>
+<p class="note"><strong>Note:</strong>
+If you have been using Eclipse with ADT, be aware that <a
+href="{@docRoot}tools/studio/index.html">Android Studio</a> is now the official IDE
+for Android, so you should migrate to Android Studio to receive all the
+latest IDE updates. For help moving projects,
+see <a href="/sdk/installing/migrate.html">Migrating to Android
+Studio</a>.</p>
- <dl>
- <dt><strong>Integrated Android project creation, building, packaging, installation, and
- debugging</strong></dt>
-
- <dd>ADT integrates many development workflow tasks into Eclipse, making it easy for you to
- rapidly develop and test your Android applications.</dd>
-
- <dt><strong>SDK Tools integration</strong></dt>
-
- <dd>Many of the <a href="#tools">SDK tools</a> are integrated into Eclipse's menus,
- perspectives, or as a part of background processes ran by ADT.</dd>
-
- <dt><strong>Java programming language and XML editors</strong></dt>
-
- <dd>The Java programming language editor contains common IDE features such as compile time
- syntax checking, auto-completion, and integrated documentation for the Android framework APIs.
- ADT also provides custom XML editors that let you
- edit Android-specific XML files in a form-based UI. A graphical layout editor lets you design
- user interfaces with a drag and drop interface.</dd>
-
- <dt><strong>Integrated documentation for Android framework APIs</strong></dt>
- <dd>You can access documentation by hovering over classes, methods, or variables.</dd>
- </dl>
+<p>If you still wish to use the ADT plugin for Eclipse, see
+<a href="{@docRoot}sdk/installing/installing-adt.html">Installing Eclipse Plugin.</a>
+</p>
- <p>You can find the most up-to-date and more detailed information about changes and new features
-on the <a href="http://tools.android.com/recent">Recent Changes</a> page at the Android Tools
-Project site.</p>
<h2 id="tools">SDK Tools Integration</h2>
@@ -568,5 +535,6 @@ to install it. </p>
<p>If you encounter problems during the update, remove the existing ADT plugin from Eclipse, then
-perform a fresh installation, using the instructions for <a href="#installing">Installing the ADT
+perform a fresh installation, using the instructions for <a
+href="{@docRoot}sdk/installing/installing-adt.html">Installing the ADT
Plugin</a>.</p>
diff --git a/docs/html/tools/revisions/build-tools.jd b/docs/html/tools/revisions/build-tools.jd
index 4afdf13..593770a 100644
--- a/docs/html/tools/revisions/build-tools.jd
+++ b/docs/html/tools/revisions/build-tools.jd
@@ -1,4 +1,5 @@
-page.title=Build Tools
+page.title=SDK Build Tools Release Notes
+
@jd:body
<div id="qv-wrapper">
diff --git a/docs/html/tools/revisions/platforms.jd b/docs/html/tools/revisions/platforms.jd
index ef8575a..a73be5e 100644
--- a/docs/html/tools/revisions/platforms.jd
+++ b/docs/html/tools/revisions/platforms.jd
@@ -1,4 +1,5 @@
-page.title=Platforms
+page.title=SDK Platforms Release Notes
+
@jd:body
<div id="qv-wrapper">
@@ -20,10 +21,16 @@ Highlights and APIs</a></li>
-<p>This document provides information about Android platform releases. In order to compile your
-application against a particular platform release, you must download and install the SDK Platform
-for that release. If you want to test your application on an emulator, you must also download at
-least one system image for that platform release.</p>
+<p>This document provides release information about the SDK Platform packages required
+for app development. If you want details about the features and APIs added in each Android
+version, instead read the highlights in the <a href="{@docRoot}about/index.html">About</a>
+section.</p>
+
+<p>In order to compile your application against a particular version of Android, you must use the
+<a href="{@docRoot}tools/help/sdk-manager.html">SDK Manager</a> to download and install the SDK
+Platform for that release. If you want to test your application on an emulator, you must also
+download at least one System Image for that Android version.</p>
+
<p>Each platform release includes system images that support a specific processor architecture,
such as ARM EABI, Intel x86 or MIPS. Platform releases also include a system image that contains
@@ -44,7 +51,7 @@ platform system images under each platform version header, for example:</p>
<p class="caution"><strong>Important:</strong> To download the most recent Android
system components from the Android SDK Manager, you must first update the SDK Tools to the
most recent release and restart the SDK Manager. If you do not, the latest Android system
-components will not be available for download.</p>
+packages may not be available for download.</p>
<h2 id="5.0">Android 5.0</h2>
@@ -52,12 +59,30 @@ components will not be available for download.</p>
<div class="toggle-content opened">
<p><a href="#" onclick="return toggleContent(this)">
<img src="{@docRoot}assets/images/triangle-opened.png"
+class="toggle-content-img" alt="" />Revision 2</a> <em>(December 2014)</em>
+ </p>
+
+ <div class="toggle-content-toggleme">
+
+ <p>Updated layouts in the Support Library and fixed various issues.</p>
+ <p>Dependencies:</p>
+ <ul>
+ <li>Android SDK Platform-tools r21 or higher is required.</li>
+ <li>Android SDK Tools 23.0.5 or higher is required.</li>
+ </ul>
+ </div>
+
+<div class="toggle-content closed">
+ <p><a href="#" onclick="return toggleContent(this)">
+ <img src="{@docRoot}assets/images/triangle-closed.png"
class="toggle-content-img" alt="" />Revision 1</a> <em>(October 2014)</em>
</p>
<div class="toggle-content-toggleme">
<p>Initial release for Android 5.0 (API level 21).</p>
+ <p>Also see the
+ <a href="{@docRoot}about/versions/android-5.0.html">Android 5.0 APIs overview</a>.</p>
<p>Dependencies:</p>
<ul>
<li>Android SDK Platform-tools r21 or higher is required.</li>
@@ -82,7 +107,7 @@ class="toggle-content-img" alt="" />Revision 1</a> <em>(October 2014)</em>
<div class="toggle-content open">
<p><a href="#" onclick="return toggleContent(this)">
- <img src="{@docRoot}assets/images/triangle-open.png"
+ <img src="{@docRoot}assets/images/triangle-closed.png"
class="toggle-content-img" alt="" />Revision 2</a> <em>(October 2014)</em>
</p>
@@ -135,6 +160,8 @@ class="toggle-content-img" alt="" />Revision 2</a> <em>(December 2013)</em>
<div class="toggle-content-toggleme">
<p>Maintenance release. The system version is 4.4.2.</p>
+ <p>Also see the
+ <a href="{@docRoot}about/versions/android-4.4.html">Android 4.4 APIs overview</a>.</p>
<dl>
<dt>Dependencies:</dt>
<dd>Android SDK Platform-tools r19 or higher is required.</dd>
@@ -153,6 +180,8 @@ class="toggle-content-img" alt="" />Revision 1</a> <em>(October 2013)</em>
<div class="toggle-content-toggleme">
<p>Initial release. The system version is 4.4.</p>
+ <p>Also see the
+ <a href="{@docRoot}about/versions/android-4.4.html">Android 4.4 APIs overview</a>.</p>
<dl>
<dt>Dependencies:</dt>
<dd>Android SDK Platform-tools r19 or higher is required.</dd>
diff --git a/docs/html/tools/revisions/studio.jd b/docs/html/tools/revisions/studio.jd
index 523929d..422beaa 100644
--- a/docs/html/tools/revisions/studio.jd
+++ b/docs/html/tools/revisions/studio.jd
@@ -1,4 +1,4 @@
-page.title=Android Studio Revisions
+page.title=Android Studio Release Notes
@jd:body
@@ -26,7 +26,7 @@ everything you need to begin developing Android apps:</p>
<li>A version of the Android system image for the emulator</li>
</ul>
-<p>For an introduction to Android Studio, make sure to read the
+<p>For an introduction to Android Studio, read the
<a href="{@docRoot}tools/studio/index.html">Android Studio</a> guide.</p>
<p>Periodic updates are pushed to Android Studio without requiring you to update from here. To
diff --git a/docs/html/tools/sdk/eclipse-adt.jd b/docs/html/tools/sdk/eclipse-adt.jd
index deafed5..c3a4dea 100644
--- a/docs/html/tools/sdk/eclipse-adt.jd
+++ b/docs/html/tools/sdk/eclipse-adt.jd
@@ -1,4 +1,4 @@
-page.title=ADT Plugin
+page.title=ADT Plugin Release Notes
@jd:body
@@ -15,29 +15,25 @@ Plugin</a></li>
</div>
<p>Android Development Tools (ADT) is a plugin for the Eclipse IDE
-that is designed to give you a powerful, integrated environment in which
-to build Android applications.</p>
-
-<p>ADT extends the capabilities of Eclipse to let you quickly set up new Android
+that extends the capabilities of Eclipse to let you quickly set up new 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.</p>
-<p>Developing in Eclipse with ADT is highly recommended and is the fastest way
-to get started. With the guided project setup it provides, as well as tools
-integration, custom XML editors, and debug output pane, ADT gives you an
-incredible boost in developing Android applications. </p>
+<p class="note"><strong>Note:</strong>
+If you have been using Eclipse with ADT, be aware that <a
+href="{@docRoot}tools/studio/index.html">Android Studio</a> is now the official IDE
+for Android, so you should migrate to Android Studio to receive all the
+latest IDE updates. For help moving projects,
+see <a href="/sdk/installing/migrate.html">Migrating to Android
+Studio</a>.</p>
-<p>This document provides step-by-step instructions on how to download the ADT
-plugin and install it into your Eclipse development environment. Note that
+<p>Note that
before you can install or use ADT, you must have compatible versions of both the
Eclipse IDE and the Android SDK installed. For details, make sure to read <a
href="{@docRoot}sdk/installing/installing-adt.html">Installing the Eclipse
Plugin</a>. </p>
-<p>If you are already using ADT, this document also provides instructions on
-how to update ADT to the latest version or how to uninstall it, if necessary.
-</p>
<p>For information about the features provided by the ADT plugin, such as code
editor features, SDK tool integration, and the graphical layout editor (for drag-and-drop layout
diff --git a/docs/html/tools/sdk/tools-notes.jd b/docs/html/tools/sdk/tools-notes.jd
index 6b3a0a9..ed48887 100644
--- a/docs/html/tools/sdk/tools-notes.jd
+++ b/docs/html/tools/sdk/tools-notes.jd
@@ -1,19 +1,15 @@
-page.title=SDK Tools
+page.title=SDK Tools Release Notes
excludeFromSuggestions=true
@jd:body
<p>SDK Tools is a downloadable component for the Android SDK. It includes the
-complete set of development and debugging tools for the Android SDK.</p>
-
-<p>If you are new to the Android SDK, the <a
-href="{@docRoot}sdk/index.html">SDK starter package</a> installs the
-latest revision of the SDK Tools in the <code>&lt;sdk&gt;/tools</code> directory.</p>
+complete set of development and debugging tools for the Android SDK. It is included
+with <a href="{@docRoot}tools/studio/index.html">Android Studio</a>.</p>
<p>If you are already using the SDK and you want to update to the latest version
-of the SDK Tools, use the <em>Android SDK Manager</em> to get the
-update, rather than downloading a new SDK starter package. For more information
-about how to update, see <a
-href="{@docRoot}tools/help/sdk-manager.html">SDK Manager</a>.</p>
+of the SDK Tools, use the <a
+href="{@docRoot}tools/help/sdk-manager.html">SDK Manager</a> to get the
+update.</p>
<h2 id="notes">Revisions</h2>
@@ -29,6 +25,33 @@ href="http://tools.android.com/knownissues">http://tools.android.com/knownissues
<div class="toggle-content opened">
<p><a href="#" onclick="return toggleContent(this)">
<img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img"
+ alt=""/>SDK Tools, Revision 24.0.1</a> <em>(December 2014)</em>
+ </p>
+
+ <div class="toggle-content-toggleme">
+
+ <dl>
+ <dt>Dependencies:</dt>
+
+ <dd>
+ <ul>
+ <li>Android SDK Platform-tools revision 19 or later.</li>
+ </ul>
+ </dd>
+
+ <dt>General Notes:</dt>
+ <dd>
+ <ul>
+ <li>Fixed Java detection issue on 32-bit Windows systems.</li>
+ </ul>
+ </dd>
+ </div>
+</div>
+
+
+<div class="toggle-content closed">
+ <p><a href="#" onclick="return toggleContent(this)">
+ <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img"
alt=""/>SDK Tools, Revision 24.0.0</a> <em>(December 2014)</em>
</p>
@@ -53,6 +76,7 @@ href="http://tools.android.com/knownissues">http://tools.android.com/knownissues
</div>
+
<div class="toggle-content closed">
<p><a href="#" onclick="return toggleContent(this)">
<img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img"
diff --git a/docs/html/tools/studio/index.jd b/docs/html/tools/studio/index.jd
index 1b9dd18..7480f57 100644
--- a/docs/html/tools/studio/index.jd
+++ b/docs/html/tools/studio/index.jd
@@ -1,4 +1,4 @@
-page.title=Android Studio
+page.title=Android Studio Overview
@jd:body
<div id="qv-wrapper">
@@ -44,7 +44,7 @@ Android Studio offers:</p>
<li>And much more</li>
</ul>
-<p><b><a href="{@docRoot}tools/sdk/index.html">Download Android Studio now</a></b>. </p>
+<p><b><a href="{@docRoot}sdk/index.html">Download Android Studio now</a></b>. </p>
<p>If you're new to Android Studio or the IntelliJ IDEA interface, this
page provides an introduction to some key Android
@@ -102,9 +102,8 @@ the <strong>Project</strong drop-down. </p>
<h3>New Project and Directory Structure</h3>
-<p>When you use the <em>Project</em> view of a new project in Android Studio or
-(<a href="{@docRoot}tools/eclipse/migrate-adt.html"> a project migrated from Eclipse</a>), you
-should notice that the project structure appears different than you may be used to. Each
+<p>When you use the <em>Project</em> view of a new project in Android Studio, you
+should notice that the project structure appears different than you may be used to in Eclipse. Each
instance of Android Studio contains a project with one or more application modules. Each
application module folder contains the complete source sets for that module, including
{@code src/main} and {@code src/androidTest} directories, resources, build
@@ -115,8 +114,9 @@ specification and the files under {@code src/androidTest} directory for test cas
<p> <img src="{@docRoot}images/tools/studio-project-layout.png" alt="" /></p>
<p> <class="img-caption"><strong>Figure 3.</strong> Android Studio project structure</p>
-<p>For more information, see <a href="http://confluence.jetbrains.com/display/IntelliJIDEA/Project +Organization"class="external-link">IntelliJ project organization</a> and
-<a href="{@docRoot}tools/workflow/project/index.html">Managing Projects</a>.</p>
+<p>For more information, see
+<a href="http://confluence.jetbrains.com/display/IntelliJIDEA/Project+Organization"class="external-link">IntelliJ project organization</a> and
+<a href="{@docRoot}tools/projects/index.html">Managing Projects</a>.</p>
<h3>Creating new files</h3>
@@ -235,8 +235,8 @@ new virtual devices for running your app in the emulator.</p>
<p>The AVD Manager comes with emulators for Nexus 6 and Nexus 9 devices and also supports
creating custom Android device skins based on specific emulator properties and assigning those
-skins to hardware profiles. Android Studio installs the the Intel x86 Emulator Accelerator (HAXM)
-and creates a default emulator for quick app prototyping.</p>
+skins to hardware profiles. Android Studio installs the Intel&#174; x86 Hardware Accelerated Execution
+Manager (HAXM) emulator accelerator and creates a default emulator for quick app prototyping.</p>
<p>For more information, see <a href="{@docRoot}tools/devices/managing-avds.html">Managing AVDs</a>.</p>
@@ -334,7 +334,7 @@ controlling device behaviors, and more. It also includes the Hierarchy Viewer to
<p>An updated installation and setup wizards walk you through a step-by-step installation
and setup process as the wizard checks for system requirements, such as the Java Development
Kit (JDK) and available RAM, and then prompts for optional installation options, such as the
-Intel &#174; HAXM accelerator.</p>
+Intel&#174; HAXM emulator accelerator.</p>
<p>An updated setup wizard walks you through the setup processes as
the wizard updates your system image and emulation requirements, such GPU, and then creates
@@ -386,7 +386,7 @@ code-level preference:
-<h2 id="other">Other Highlights/h2>
+<h2 id="other">Other Highlights</h2>
<h3> Translation Editor</h3>
<p>Multi-language support is enhanced with the Translation Editor plugin so you can easily add
@@ -414,5 +414,5 @@ and &lt;animated-selector&gt;, are supported.</p>
<p>Clicking <strong>Import Samples</strong> from the <strong>File</strong> menu or Welcome page
provides seamless access to Google code samples on GitHub.</p>
<p><img src="{@docRoot}images/tools/studio-samples-githubaccess.png" /></p>
- <p class="img-caption"><strong>Figure 12.</strong> Code Sample Access/p>
+ <p class="img-caption"><strong>Figure 12.</strong> Code Sample Access</p>
diff --git a/docs/html/tools/tools_toc.cs b/docs/html/tools/tools_toc.cs
index a8c588a..9437c1b 100644
--- a/docs/html/tools/tools_toc.cs
+++ b/docs/html/tools/tools_toc.cs
@@ -122,7 +122,7 @@
<li class="nav-section">
<div class="nav-section-header"><a href="<?cs var:toroot ?>tools/debugging/index.html"><span class="en">Debugging</span></a></div>
<ul>
- <li><a href="<?cs var:toroot ?>tools/debugging/debugging-projects.html"><span class="en">From Eclipse with ADT</span></a></li>
+ <li><a href="<?cs var:toroot ?>tools/debugging/debugging-studio.html"><span class="en">From Android Studio</span></a></li>
<li><a href="<?cs var:toroot ?>tools/debugging/debugging-projects-cmdline.html"><span class="en">From Other IDEs</span></a></li>
<li><a href="<?cs var:toroot ?>tools/debugging/ddms.html"><span class="en">Using DDMS</span></a></li>
<li><a href="<?cs var:toroot ?>tools/debugging/debugging-log.html"><span class="en">Reading and Writing Logs</span></a></li>
@@ -145,27 +145,12 @@
</ul>
</li>
- <li class="nav-section">
- <div class="nav-section-header"><a href="<?cs var:toroot ?>tools/support-library/index.html"><span
-class="en">Support Library</span></a></div>
- <ul>
- <li><a href="<?cs var:toroot ?>tools/support-library/features.html">Features</a></li>
- <li><a href="<?cs var:toroot ?>tools/support-library/setup.html">Setup</a></li>
- </ul>
- </li>
<li class="nav-section">
<div class="nav-section-header"><a href="<?cs var:toroot ?>tools/help/index.html"><span
class="en">Tools Help</span></a></div>
<ul>
<li><a href="<?cs var:toroot ?>tools/help/adb.html">adb</a></li>
- <li class="nav-section">
- <div class="nav-section-header"><a href="<?cs var:toroot ?>tools/help/adt.html">ADT</a></div>
- <ul>
- <li><a href="<?cs var:toroot ?>sdk/installing/installing-adt.html">
- <span class="en">Installing the Eclipse Plugin</span></a></li>
- </ul>
- </li>
<li><a href="<?cs var:toroot ?>tools/help/android.html">android</a></li>
<li><a href="<?cs var:toroot ?>tools/help/avd-manager.html">AVD Manager</a></li>
<li><a href="<?cs var:toroot ?>tools/help/bmgr.html">bmgr</a>
@@ -262,10 +247,10 @@ class="en">Support Library</span></a></div>
<span class="en">SDK Tools</span>
</a></li>
<li><a href="<?cs var:toroot ?>tools/revisions/build-tools.html">
- <span class="en">Build Tools</span>
+ <span class="en">SDK Build Tools</span>
</a></li>
<li><a href="<?cs var:toroot ?>tools/revisions/platforms.html">
- <span class="en">Platforms</span></a></li>
+ <span class="en">SDK Platforms</span></a></li>
<li><a href="<?cs var:toroot ?>tools/sdk/eclipse-adt.html">
<span class="en">ADT Plugin</span></a></li>
</ul>
@@ -293,11 +278,13 @@ class="en">Support Library</span></a></div>
<li class="nav-section">
<div class="nav-section-header">
- <a href="<?cs var:toroot ?>tools/eclipse/index.html">
+ <a href="<?cs var:toroot ?>tools/help/adt.html">
<span class="en">Eclipse with ADT</span></a>
</div>
<ul>
<li><a href="<?cs var:toroot ?>sdk/installing/migrate.html">Migrating to Android Studio</a></li>
+ <li><a href="<?cs var:toroot ?>sdk/installing/installing-adt.html">
+ <span class="en">Installing the Eclipse Plugin</span></a></li>
<li><a href="<?cs var:toroot ?>tools/projects/projects-eclipse.html">Managing Projects</a></li>
<li><a href="<?cs var:toroot ?>tools/building/building-eclipse.html">Building and Running</a></li>
<li><a href="<?cs var:toroot ?>tools/building/building-cmdline-ant.html">Building with Ant</a></li>
diff --git a/docs/html/tools/workflow/index.jd b/docs/html/tools/workflow/index.jd
index f76df75..6a114c7 100644
--- a/docs/html/tools/workflow/index.jd
+++ b/docs/html/tools/workflow/index.jd
@@ -1,9 +1,9 @@
-page.title=Introduction
+page.title=Developer Workflow
@jd:body
-<p>To develop apps for Android devices, you use a set of tools that are included in the Android SDK.
-Once you've downloaded Android Studio and the Android SDK tools you can access these tools directly.
-You can also access most of the SDK tools from the command line. Developing with Android Studio is the
+<p>To develop apps for Android, you use a set of tools that are included in Android Studio.
+In addition to using the tools from Android Studio,
+you can also access most of the SDK tools from the command line. Developing with Android Studio is the
preferred method because it can directly invoke the tools that you need while developing applications.</p>
<p>However, you may choose to develop with another IDE or a simple text editor and invoke the