Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e29e218 authored by smain@google.com's avatar smain@google.com Committed by Android Git Automerger
Browse files

am acd40aa9: am 67fa34e9: am 2d0cf342: am d0c79c4e: fix migrate guide and other studio edits [CP] 

* commit 'acd40aa9':
  fix migrate guide and other studio edits [CP]
parents 8dac5b5e acd40aa9

docs/html/sdk/index.jd

+2 −2
Original line number Diff line number Diff line
@@ -296,8 +296,8 @@ href="http://developer.android.com/sdk/index.html">developer.android.com/sdk/</a 


<ul style="margin-top:70px;color:#444">

  <li><a href="#Requirements">System Requirements</a></li>

  <li><a href="#Other">Other SDK Downloads</a></li>

  <li><a href="{@docRoot}sdk/installing/migrate.html">Migrate from Eclipse</a></li>

  <li><a href="#Other">Other Download Options</a></li>

  <li><a href="{@docRoot}sdk/installing/migrate.html">Migrating to Android Studio</a></li>

</ul>



</div>

docs/html/sdk/installing/migrate.jd

+3 −6
Original line number Diff line number Diff line
@@ -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>
@@ -29,7 +30,7 @@ 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>



<h2 id="import">Import into Android Studio</h2>
@@ -45,10 +46,6 @@ 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>

<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>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

docs/html/tools/tools_toc.cs

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ class="en">Support Library</span></a></div> 
      <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>