From d0c79c4e95da9aa75847d7539272e278a7cd97f0 Mon Sep 17 00:00:00 2001 From: "smain@google.com" Date: Fri, 5 Dec 2014 20:29:42 -0800 Subject: [PATCH] fix migrate guide and other studio edits [CP] Cherry-pick from Change-Id: Ic223d8fa3cd1e66ddd37b8f896fef12869be4268 Change-Id: Iaa878bd8b7dc97391b8f2d635f45a646656891e4 --- docs/html/sdk/index.jd | 4 ++-- docs/html/sdk/installing/migrate.jd | 9 +++------ docs/html/tools/tools_toc.cs | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd index 8ab3e58c0e509..27978a46279e1 100644 --- a/docs/html/sdk/index.jd +++ b/docs/html/sdk/index.jd @@ -296,8 +296,8 @@ href="http://developer.android.com/sdk/index.html">developer.android.com/sdk/
  • System Requirements
    • -
  • Other SDK Downloads
    • -
  • Migrate from Eclipse
    • +
  • Other Download Options
    • +
  • Migrating to Android Studio
    • diff --git a/docs/html/sdk/installing/migrate.jd b/docs/html/sdk/installing/migrate.jd index 708f27e660361..b888bd81771d6 100644 --- a/docs/html/sdk/installing/migrate.jd +++ b/docs/html/sdk/installing/migrate.jd @@ -14,7 +14,8 @@ page.title=Migrating to Android Studio -

    To quickly start developing apps, we recommend you migrate to Android Studio, a new Android +

    If you're currently using Eclipse with ADT, 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:

    @@ -29,7 +30,7 @@ IntelliJ, Android Studio offers:

    href="https://developers.google.com/cloud/devtools/android_studio_templates/" class="external-link">Google Cloud Platform, making it easy to integrate Google Cloud Messaging and App Engine. -
  • And much more.
    • +
  • And much more.

    • Import into Android Studio

    @@ -45,10 +46,6 @@ to Android Studio, you can import your project into Android Studio.

    build.gradle file and click OK.
  • In the following dialog, leave Use gradle wrapper selected and click OK. (You do not need to specify the Gradle home.)
    • -

    Now that your project is imported to Android Studio, -read Android Studio for some -help getting started.

    -

    It's possible to import an existing Android project to Android Studio even if you don't generate a Gradle build file from Eclipse—Android Studio will successfully build and diff --git a/docs/html/tools/tools_toc.cs b/docs/html/tools/tools_toc.cs index 62113682968c6..68e25cd4a3409 100644 --- a/docs/html/tools/tools_toc.cs +++ b/docs/html/tools/tools_toc.cs @@ -297,7 +297,7 @@ class="en">Support Library Eclipse with ADT