resolved conflicts for merge of cf8a8019 to master (b953e28e) · Commits · e / os / android_frameworks_base

docs/html/tools/revisions/build-tools.jd

+2 −1

Original line number	Diff line number	Diff line
		page.title=Build Tools
		page.title=SDK Build Tools Release Notes

		@jd:body

		<div id="qv-wrapper">

docs/html/tools/revisions/platforms.jd

+20 −7

Original line number	Diff line number	Diff line
		page.title=Platforms
		page.title=SDK Platforms Release Notes

		@jd:body

		<div id="qv-wrapper">
		@@ -20,10 +21,16 @@ Highlights and APIs</a></li>



		<p>This document provides information about Android platform releases. In order to compile your
		application against a particular platform release, you must download and install the SDK Platform
		for that release. If you want to test your application on an emulator, you must also download at
		least one system image for that platform release.</p>
		<p>This document provides release information about the SDK Platform packages required
		for app development. If you want details about the features and APIs added in each Android
		version, instead read the highlights in the <a href="{@docRoot}about/index.html">About</a>
		section.</p>

		<p>In order to compile your application against a particular version of Android, you must use the
		<a href="{@docRoot}tools/help/sdk-manager.html">SDK Manager</a> to download and install the SDK
		Platform for that release. If you want to test your application on an emulator, you must also
		download at least one System Image for that Android version.</p>


		<p>Each platform release includes system images that support a specific processor architecture,
		such as ARM EABI, Intel x86 or MIPS. Platform releases also include a system image that contains
		@@ -44,7 +51,7 @@ platform system images under each platform version header, for example:</p>
		<p class="caution"><strong>Important:</strong> To download the most recent Android
		system components from the Android SDK Manager, you must first update the SDK Tools to the
		most recent release and restart the SDK Manager. If you do not, the latest Android system
		components will not be available for download.</p>
		packages may not be available for download.</p>


		<h2 id="5.0">Android 5.0</h2>
		@@ -58,6 +65,8 @@ class="toggle-content-img" alt="" />Revision 1</a> <em>(October 2014)</em>
		<div class="toggle-content-toggleme">

		<p>Initial release for Android 5.0 (API level 21).</p>
		<p>Also see the
		<a href="{@docRoot}about/versions/android-5.0.html">Android 5.0 APIs overview</a>.</p>
		<p>Dependencies:</p>
		<ul>
		<li>Android SDK Platform-tools r21 or higher is required.</li>
		@@ -82,7 +91,7 @@ class="toggle-content-img" alt="" />Revision 1</a> <em>(October 2014)</em>

		<div class="toggle-content open">
		<p><a href="#" onclick="return toggleContent(this)">
		<img src="{@docRoot}assets/images/triangle-open.png"
		<img src="{@docRoot}assets/images/triangle-closed.png"
		class="toggle-content-img" alt="" />Revision 2</a> <em>(October 2014)</em>
		</p>

		@@ -135,6 +144,8 @@ class="toggle-content-img" alt="" />Revision 2</a> <em>(December 2013)</em>
		<div class="toggle-content-toggleme">

		<p>Maintenance release. The system version is 4.4.2.</p>
		<p>Also see the
		<a href="{@docRoot}about/versions/android-4.4.html">Android 4.4 APIs overview</a>.</p>
		<dl>
		<dt>Dependencies:</dt>
		<dd>Android SDK Platform-tools r19 or higher is required.</dd>
		@@ -153,6 +164,8 @@ class="toggle-content-img" alt="" />Revision 1</a> <em>(October 2013)</em>
		<div class="toggle-content-toggleme">

		<p>Initial release. The system version is 4.4.</p>
		<p>Also see the
		<a href="{@docRoot}about/versions/android-4.4.html">Android 4.4 APIs overview</a>.</p>
		<dl>
		<dt>Dependencies:</dt>
		<dd>Android SDK Platform-tools r19 or higher is required.</dd>

docs/html/tools/revisions/studio.jd

+2 −2

Original line number	Diff line number	Diff line
		page.title=Android Studio Revisions
		page.title=Android Studio Release Notes

		@jd:body

		@@ -26,7 +26,7 @@ everything you need to begin developing Android apps:</p>
		<li>A version of the Android system image for the emulator</li>
		</ul>

		<p>For an introduction to Android Studio, make sure to read the
		<p>For an introduction to Android Studio, read the
		<a href="{@docRoot}tools/studio/index.html">Android Studio</a> guide.</p>

		<p>Periodic updates are pushed to Android Studio without requiring you to update from here. To

docs/html/tools/sdk/eclipse-adt.jd

+8 −14

Original line number	Diff line number	Diff line
		page.title=ADT Plugin
		page.title=ADT Plugin Release Notes

		@jd:body

		@@ -15,29 +15,23 @@ Plugin</a></li>
		</div>

		<p>Android Development Tools (ADT) is a plugin for the Eclipse IDE
		that is designed to give you a powerful, integrated environment in which
		to build Android applications.</p>

		<p>ADT extends the capabilities of Eclipse to let you quickly set up new Android
		that extends the capabilities of Eclipse to let you quickly set up new Android
		projects, create an application UI, add packages based on the Android
		Framework API, debug your applications using the Android SDK tools, and even
		export signed (or unsigned) {@code .apk} files in order to distribute your application.</p>

		<p>Developing in Eclipse with ADT is highly recommended and is the fastest way
		to get started. With the guided project setup it provides, as well as tools
		integration, custom XML editors, and debug output pane, ADT gives you an
		incredible boost in developing Android applications. </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>This document provides step-by-step instructions on how to download the ADT
		plugin and install it into your Eclipse development environment. Note that
		<p>Note that
		before you can install or use ADT, you must have compatible versions of both the
		Eclipse IDE and the Android SDK installed. For details, make sure to read <a
		href="{@docRoot}sdk/installing/installing-adt.html">Installing the Eclipse
		Plugin</a>. </p>

		<p>If you are already using ADT, this document also provides instructions on
		how to update ADT to the latest version or how to uninstall it, if necessary.
		</p>

		<p>For information about the features provided by the ADT plugin, such as code
		editor features, SDK tool integration, and the graphical layout editor (for drag-and-drop layout

docs/html/tools/sdk/tools-notes.jd

+6 −10

Original line number	Diff line number	Diff line
		page.title=SDK Tools
		page.title=SDK Tools Release Notes
		excludeFromSuggestions=true
		@jd:body

		<p>SDK Tools is a downloadable component for the Android SDK. It includes the
		complete set of development and debugging tools for the Android SDK.</p>

		<p>If you are new to the Android SDK, the <a
		href="{@docRoot}sdk/index.html">SDK starter package</a> installs the
		latest revision of the SDK Tools in the <code><sdk>/tools</code> directory.</p>
		complete set of development and debugging tools for the Android SDK. It is included
		with <a href="{@docRoot}tools/studio/index.html">Android Studio</a>.</p>

		<p>If you are already using the SDK and you want to update to the latest version
		of the SDK Tools, use the <em>Android SDK Manager</em> to get the
		update, rather than downloading a new SDK starter package. For more information
		about how to update, see <a
		href="{@docRoot}tools/help/sdk-manager.html">SDK Manager</a>.</p>
		of the SDK Tools, use the <a
		href="{@docRoot}tools/help/sdk-manager.html">SDK Manager</a> to get the
		update.</p>


		<h2 id="notes">Revisions</h2>