fix migrate guide and other studio edits (c21a05fb) · Commits · e / os / android_frameworks_base

docs/html/sdk/index.jd

+1 −1

Original line number	Diff line number	Diff line
		@@ -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>

docs/html/sdk/installing/migrate.jd

+24 −8

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>
		<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 > 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—Android Studio will successfully build and

docs/html/tools/tools_toc.cs

+1 −1

Original line number	Diff line number	Diff line
		@@ -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>