summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorsmain@google.com <smain@google.com>2014-12-05 20:29:42 -0800
committersmain@google.com <smain@google.com>2014-12-05 20:29:42 -0800
commitc21a05fbe32e416c41a2d8b616458301466fd6b7 (patch)
treef3da42d37bf11dd2a3da2b0c698b07735a49360c /docs
parent74056511b6f864a36b50938e882e9307c85ae304 (diff)
downloadframeworks_base-c21a05fbe32e416c41a2d8b616458301466fd6b7.zip
frameworks_base-c21a05fbe32e416c41a2d8b616458301466fd6b7.tar.gz
frameworks_base-c21a05fbe32e416c41a2d8b616458301466fd6b7.tar.bz2
fix migrate guide and other studio edits
Change-Id: Ic223d8fa3cd1e66ddd37b8f896fef12869be4268
Diffstat (limited to 'docs')
-rw-r--r--docs/html/sdk/index.jd2
-rw-r--r--docs/html/sdk/installing/migrate.jd32
-rw-r--r--docs/html/tools/tools_toc.cs2
3 files changed, 26 insertions, 10 deletions
diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd
index f2b42cf..37d5c57 100644
--- a/docs/html/sdk/index.jd
+++ b/docs/html/sdk/index.jd
@@ -301,7 +301,7 @@ href="http://developer.android.com/sdk/index.html">developer.android.com/sdk/</a
<ul style="margin-top:50px;color:#444">
<li><a href="#Requirements">System Requirements</a></li>
<li><a href="#Other">Other Download Options</a></li>
- <li><a href="{@docRoot}sdk/installing/migrate.html">Migrate from Eclipse</a></li>
+ <li><a href="{@docRoot}sdk/installing/migrate.html">Migrating to Android Studio</a></li>
</ul>
</div>
diff --git a/docs/html/sdk/installing/migrate.jd b/docs/html/sdk/installing/migrate.jd
index fd70c48..81d6f92 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
</div>
</div>
-<p>To quickly start developing apps, we recommend you migrate to Android Studio, a new Android
+<p>If you're currently using Eclipse with ADT, we recommend you migrate to <a
+href={@docRoot}tools/basics/index.html">Android Studio</a>, a new Android
development environment powered by IntelliJ IDEA. On top of the capabilities you expect from
IntelliJ, Android Studio offers:</p>
<ul>
@@ -28,18 +29,33 @@ IntelliJ, Android Studio offers:</p>
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>
+ <li>And <a href="{@docRoot}tools/studio/index.html">much more</a>.</li>
</ul>
-<p>If you've previously developed for Android using Eclipse and would like to migrate
+<p>To migrate existing Android projects from Eclipse,
+you should export your projects from Eclipse in order to generate
+Gradle build files:</p>
-to Android Studio, you should export your projects from Eclipse in order to generate
-Gradle build files. You can then import your project into Android Studio.</p>
+<ol>
+ <li>In Eclipse, select <strong>File &gt; Export</strong>.</li>
+ <li>Select <strong>Generate Gradle build files</strong> inside the Android folder, then click
+ <strong>Next</strong>.</li>
+ <li>Click <strong>Browse</strong> to find your project to export.</li>
+ <li>Select your project from the list, click <strong>OK</strong>, then <strong>Finish</strong>.</li>
+</ol>
-<p>Now that your project is imported to Android Studio,
-read <a href="{@docRoot}tools/basics/index.html">Android Studio Basics</a> for some
-help getting started.</p>
+<p>You can then import the project into Android Studio:</p>
+
+<ol>
+ <li>In Android Studio, close any projects currently open. You should see the
+ <strong>Welcome to Android Studio</strong> window.</li>
+ <li>Click <strong>Import Project</strong>.</li>
+ <li>Locate the project you exported from Eclipse, expand it, select the
+ <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>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
diff --git a/docs/html/tools/tools_toc.cs b/docs/html/tools/tools_toc.cs
index ab9a5fb..5a6fa92 100644
--- a/docs/html/tools/tools_toc.cs
+++ b/docs/html/tools/tools_toc.cs
@@ -292,7 +292,7 @@ class="en">Platforms</span></a></li>
<span class="en">Eclipse with ADT</span></a>
</div>
<ul>
- <li><a href="<?cs var:toroot ?>tools/eclipse/migrate-adt.html">Migrating to Android Studio</a></li>
+ <li><a href="<?cs var:toroot ?>tools/sdk/installing/migrate.html">Migrating to Android Studio</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/testing/testing_eclipse.html">Testing</a></li>