resolved conflicts for merge of bd5098e6 to master (33f6c9f4) · Commits · e / os / android_frameworks_base

docs/html/sdk/installing/index.jd

+0 −41

Original line number	Diff line number	Diff line
		@@ -274,47 +274,6 @@ Continue: Adding SDK Packages</a></p>



		<!-- ################### ADT BUNDLE ####################### -->
		<div id="adt" heading="Installing the Eclipse ADT Bundle" style="display:none">


		<p>The Eclipse ADT Bundle provides everything you need to start developing apps, including
		the Android SDK tools and a version of the Eclipse IDE with built-in ADT
		(Android Developer Tools) to streamline your Android app development.</p>

		<p>If you didn't download the Eclipse ADT bundle, go <a href="{@docRoot}tools/eclipse/index.html"
		><b>download the Eclipse ADT bundle now</b></a>, or switch to the
		<a href="{@docRoot}sdk/installing/index.html?pkg=studio">Android Studio
		install</a> or <a href="{@docRoot}sdk/installing/index.html?pkg=tools">stand-alone SDK Tools
		install</a> instructions</i>.</p>

		<div class="procedure-box">
		<p><b>To set up the ADT Bundle:</b></p>
		<ol>
		<li>Unpack the ZIP file
		(named {@code adt-bundle-<os_platform>.zip}) and save it to an appropriate location,
		such as a "Development" directory in your home directory.</li>
		<li>Open the {@code adt-bundle-<os_platform>/eclipse/} directory and launch
		<strong>Eclipse</strong>.</li>
		</ol>

		<p class="caution"><strong>Caution:</strong> Do not move any of the files or directories
		from the {@code adt-bundle-<os_platform>} directory. If you move the {@code eclipse/}
		or {@code sdk/} directory, ADT will not be able to locate the SDK and you'll
		need to manually update the ADT preferences.</p>
		</div>

		<p>Eclipse with ADT is now ready and loaded with the Android developer tools, but there are still
		a couple packages you should add to make your Android SDK complete.</p>

		<p class="paging-links">
		<a href="{@docRoot}sdk/installing/adding-packages.html" class="next-page-link">
		Continue: Adding SDK Packages</a></p>


		</div>
		<!-- ################ END ADT BUNDLE ##################### -->

docs/html/sdk/installing/installing-adt.jd

+10 −5

Original line number	Diff line number	Diff line
		@@ -15,12 +15,17 @@ of Eclipse to let you quickly set up new Android projects, build an app
		UI, debug your app, and export signed (or unsigned) app packages (APKs) for distribution.
		</p>

		<p class="note"><strong>Note:</strong> You should install the ADT plugin
		only if you already have an Eclipse installation that you want to continue using. If you do not
		have Eclipse installed, you should instead <b><a href="{@docRoot}sdk/index.html">install
		the complete Android SDK</a></b>, which includes the latest IDE for Android developers.</p>

		<p>Your existing Eclipse installation must meet these requirements:</p>
		<p class="caution"><strong>Caution:</strong>
		The ADT plugin for Eclipse is no longer in active development. If you're currently using it,
		you should <a href="{@docRoot}sdk/installing/migrate.html">migrate
		to Android Studio</a> as soon as possible. For more details about Android Studio, see the
		<a href="{@docRoot}tools/studio/index.html">Android Studio</a> guide.</p>


		<p>You should install the ADT plugin
		only if you already have an Eclipse installation that you want to continue using.
		Your existing Eclipse installation must meet these requirements:</p>
		<ul>
		<li><a href="http://eclipse.org/mobile/">Eclipse</a> 3.7.2 (Indigo) or greater
		<p class="note"><strong>Note:</strong> Eclipse 3.6 (Helios) is no longer

docs/html/sdk/installing/migrate.jd

+11 −22

Original line number	Diff line number	Diff line
		@@ -6,7 +6,8 @@ page.title=Migrating to Android Studio
		<div id="qv">
		<h2>See also</h2>
		<ul>
		<li><a href="http://confluence.jetbrains.com/display/IntelliJIDEA/FAQ+on+Migrating+to+IntelliJ+IDEA">IntelliJ FAQ on migrating to IntelliJ IDEA</a></li>
		<li><a href="http://confluence.jetbrains.com/display/IntelliJIDEA/FAQ+on+Migrating+to+IntelliJ+IDEA"
		class="external-link">IntelliJ FAQ on migrating to IntelliJ IDEA</a></li>
		<li><a href="http://confluence.jetbrains.com/display/IntelliJIDEA/Working+in+Eclipse+Compatibility+Mode" class="external-link"
		>Eclipse Compatibility Mode</a></li>
		<li><a href="http://confluence.jetbrains.com/display/IntelliJIDEA/FAQ+on+Migrating+to+IntelliJ+IDEA" class="external-link"
		@@ -17,22 +18,11 @@ page.title=Migrating to Android Studio

		<p>If you're currently using Eclipse with ADT, we recommend you migrate to
		<a href="{@docRoot}tools/studio/index.html">Android Studio</a> as soon as possible, because
		the ADT plugin for Eclipse is no longer in active development.</p>
		the <a href="{@docRoot}tools/help/adt.html">ADT plugin</a>
		for Eclipse is no longer in active development.</p>

		<p>To migrate existing Android projects from Eclipse,
		you should export your projects from Eclipse in order to generate
		Gradle build files:</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>You can then import the project into Android Studio:</p>
		<p>To migrate existing Android projects, simply import them using Android Studio:</p>

		<ol>
		<li>In Android Studio, close any projects currently open. You should see the
		@@ -44,11 +34,10 @@ Gradle build files:</p>
		<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
		run projects using an existing Ant build file. However, in order to take advantage of build
		variants and other advanced features in the future,
		you should generate a Gradle build file using
		the ADT plugin or write your own Gradle build file for use with Android Studio.</p>
		<p>Android Studio properly updates the project structure and creates the appropriate
		Gradle build file.</p>

		<p><a href="{@docRoot}tools/studio/index.html">Learn more about Android Studio</a>.</p>
		<p>For more help getting started with Android Studio and the IntelliJ user experience,
		<a href="{@docRoot}tools/studio/index.html">learn more about Android Studio</a> and
		read <a href="http://confluence.jetbrains.com/display/IntelliJIDEA/FAQ+on+Migrating+to+IntelliJ+IDEA"
		class="external-link">FAQ on Migrating to IntelliJ IDEA</a>.</p>

docs/html/sdk/installing/studio-build.jd

+1 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@ page.title=Build System Overview
		<li><a href="{@docRoot}sdk/installing/studio.html">
		Getting Started with Android Studio</a></li>
		<li><a href="{@docRoot}tools/studio/index.html">Android Studio Basics</a></li>
		<li><a href="{@docRoot}tools/eclipse/migrate-adt.html">Migrating from Eclipse</a></li>
		<li><a href="{@docRoot}sdk/installing/migrate.html">Migrating from Eclipse</a></li>
		</div>
		</div>

docs/html/tools/eclipse/index.jd

deleted100644 → 0

+0 −41

Original line number	Diff line number	Diff line
		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/studio/index.html">Android Studio</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 the
		<a href="{@docRoot}tools/studio/index.html">Android Studio</a> guide.

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