am 53513e9e: am 5962474c: am fc64b70a: docs: new Eclipse menu [CP]

* commit '53513e9e1fc69f3387e8bc1a10cb5be563523068':
  docs: new Eclipse menu [CP]

4 files changed, 95 insertions, 23 deletions

diff --git a/docs/html/sdk/installing/migrate.jd b/docs/html/sdk/installing/migrate.jd
index b83f8d37c504..708f27e66036 100644
--- a/docs/html/sdk/installing/migrate.jd
+++ b/docs/html/sdk/installing/migrate.jd
@@ -1,4 +1,4 @@
-page.title=Migrating from Eclipse
+page.title=Migrating to Android Studio
 
 @jd:body
 
@@ -14,11 +14,29 @@ page.title=Migrating from Eclipse
 </div>
 </div>
 
+<p>To quickly start developing apps, we recommend you migrate to Android Studio, a new Android
+development environment powered by IntelliJ IDEA. On top of the capabilities you expect from
+IntelliJ, Android Studio offers:</p>
+
+<ul>
+  <li>Flexible Gradle-based build system.</li>
+  <li>Build variants and multiple APK generation.</li>
+  <li>Expanded template support for Google services and various device types.</li>
+  <li>Rich layout editor with support for theme editing.</li>
+  <li>Lint tools to catch performance, usability, version compatibility, and other problems.</li>
+  <li>ProGuard and app-signing capabilities.</li>
+  <li>Built-in support for <a
+  href="https://developers.google.com/cloud/devtools/android_studio_templates/"
+  class="external-link">Google Cloud Platform</a>, making it easy to integrate Google Cloud
+  Messaging and App Engine.</li>
+  <li>And much more.</li>
+</ul>
+
+<h2 id="import">Import into Android Studio</h2>
+
 <p>If you've previously developed for Android using Eclipse and would like to migrate
 to Android Studio, you can import your project into Android Studio.</p>
 
-
-<h2 id="Export">Import into Android Studio</h2>
 <ol>
   <li>In Android Studio, close any projects currently open. You should see the
   <strong>Welcome to Android Studio</strong> window.</li>
@@ -27,21 +45,18 @@ to Android Studio, you can import your project into Android Studio.</p>
   <strong>build.gradle</strong> file and click <strong>OK</strong>.</li>
   <li>In the following dialog, leave <strong>Use gradle wrapper</strong> selected and click
   <strong>OK</strong>. (You do not need to specify the Gradle home.)</li>
-</ol>
-
-
-<p>Now that your project is imported to Android Studio, 
-read <a href="{@docRoot}sdk/installing/studio-tips.html">Tips and Tricks</a> for some
+<p>Now that your project is imported to Android Studio,
+read <a href="{@docRoot}tools/studio/index.html">Android Studio</a> for some
 help getting started.</p>
 
 
-<p class="note"><strong>Note:</strong>
-It's possible to import an existing Android project to Android Studio even if you
+<p>It's possible to import an existing Android project to Android Studio even if you
 don't generate a Gradle build file from Eclipse&mdash;Android Studio will successfully build and
-run projects using an existing Ant build file. However, in order to take advantage of build
+run projects using an existing Ant build file.</p>
+
+<p>However, in order to take advantage of build
 variants and other advanced features in the future,
 we strongly suggest that you generate a Gradle build file using
 the ADT plugin or write your own Gradle build file for use with Android Studio.
-For more information about the Gradle build system, see the
-<a href="http://tools.android.com/tech-docs/new-build-system/user-guide">Gradle
-Plugin User Guide</a>.</p>
+For more information about the build system, see the
+<a href="{@docRoot}sdk/installing/studio-build.html">Build System</a> guide.</p>
diff --git a/docs/html/tools/building/building-eclipse.jd b/docs/html/tools/building/building-eclipse.jd
index 7a4367ac3205..89c3e166c99e 100644
--- a/docs/html/tools/building/building-eclipse.jd
+++ b/docs/html/tools/building/building-eclipse.jd
@@ -28,11 +28,11 @@ parent.link=index.html
   following topics show you how to run an application, which will automatically build your
   application as well.</p>
 
-  <p>To distribute your application, however, you must build your application in release mode and sign the
-  <code>.apk</code> file with your own private key.</p>
-  
-   <p>This document shows you how to run your application on an emulator or a real device 
-   from Eclipse&mdash;all of which is done using the debug version of your application. 
+  <p>To distribute your application, however, you must build your application in release mode and
+  sign the <code>.apk</code> file with your own private key.</p>
+
+   <p>This document shows you how to run your application on an emulator or a real device
+   from Eclipse&mdash;all of which is done using the debug version of your application.
    For more information about how to sign your application with a private key for release, see <a href=
   "{@docRoot}tools/publishing/app-signing.html#ExportWizard">Signing Your Applications</a></p>
 
@@ -159,9 +159,10 @@ parent.link=index.html
     of the build target, a "device chooser" is shown to let you select which device to use.</li>
 
     <li>If there are no devices or emulators running that meet the requirements of the build
-    target, ADT looks at the available AVDs. If there is an AVD that matches the build target of the project,
-    ADT chooses that AVD. If the AVD versions are newer than the build target of the project, ADT chooses
-    the oldest possible version of an AVD that meets the project's build target requirement.</li>
+    target, ADT looks at the available AVDs. If there is an AVD that matches the build target of the
+    project, ADT chooses that AVD. If the AVD versions are newer than the build target of the project,
+    ADT chooses the oldest possible version of an AVD that meets the project's build target
+    requirement.</li>
 
     <li>If there are no suitable AVDs, the application is not installed a console error warning tells
     you that there is no existing AVD that meets the build target requirements.</li>
@@ -172,4 +173,4 @@ parent.link=index.html
   launched.</p>
 
   <p>If your run configuration uses <strong>manual</strong> mode, then the "device chooser" is
-  presented every time that your application is run, so that you can select which AVD to use.</p>
\ No newline at end of file
+  presented every time that your application is run, so that you can select which AVD to use.</p>
diff --git a/docs/html/tools/eclipse/index.jd b/docs/html/tools/eclipse/index.jd
new file mode 100644
index 000000000000..1a125f5307f9
--- /dev/null
+++ b/docs/html/tools/eclipse/index.jd
@@ -0,0 +1,37 @@
+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/basics/index.html">Android Studio Basics</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
+<a href="{@docRoot}tools/studio/basics.html">Android Studio basics.</a>
+
+<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/tools_toc.cs b/docs/html/tools/tools_toc.cs
index 7efbf47829aa..8ae691615d67 100644
--- a/docs/html/tools/tools_toc.cs
+++ b/docs/html/tools/tools_toc.cs
@@ -256,6 +256,25 @@ class="en">MonkeyRunner</span></a></li>
     </ul>
   </li>
 
+
+<!-- Eclipse ADT menu-->
+
+  <li class="nav-section">
+    <div class="nav-section-header">
+    <a href="<?cs var:toroot ?>tools/eclipse/index.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">Installing</a></li>
+    <li><a href="<?cs var:toroot ?>tools/projects/projects-eclipse.html">Setting Up Projects</a></li>
+    <li><a href="<?cs var:toroot ?>tools/building/building-eclipse.html">Building</a></li>
+    <li><a href="<?cs var:toroot ?>tools/debugging/debugging-projects.html">Debugging</a></li>
+    <li><a href="<?cs var:toroot ?>tools/testing/testing_eclipse.html">Testing</a></li>
+    </ul>
+  </li><!-- end of Eclipse  -->
+
+
 </ul><!-- nav -->
 
 <script type="text/javascript">