am 5b16e21b: am 6554bb45: am 1a2308bb: Merge "misc updates related to Android... (5a267e72) · Commits · e / os / android_frameworks_base

docs/html/about/start.jd

+12 −7

Original line number	Diff line number	Diff line
		@@ -5,9 +5,10 @@ walkthru=0
		@jd:body

		<p>Everything you need to start developing apps for Android is available here on
		developer.android.com. You'll find everything from the developer SDK, API documentation, and design
		guidelines, to information about the current device landscape and how you can distribute and
		monetize your app.</p>
		<em>developer.android.com</em>. You'll find everything from the API documentation
		and design guidelines, to information about the current device landscape and how you can distribute
		and monetize your app.</p>


		<p>No two apps are built in the same way, but we've structured the information you need to build an
		app into the following three sections that represent the general order for app development.
		@@ -32,7 +33,7 @@ the Android user experience. Although you may know what a user will <em>do</em>
		should pause to focus on how a user will <em>interact</em> with it. Your design should be sleek,
		simple, powerful, and tailored to the Android experience.</p>

		<p>So whether you're a one-man shop or a large team, you should study the <a
		<p>So whether you're creating an app alone or you're part of a team, study the <a
		href="{@docRoot}design/index.html">Design</a> guidelines first.</p>
		</div>

		@@ -59,6 +60,10 @@ types of devices your app supports. Everything you need to get started with this
		available in the <a href="{@docRoot}distribute/index.html">Distribute</a> section.</p>
		</div>

		<p style="clear:both;height:0"> </p>

		<p style="clear:both">Now that you know what's available, get started by installing the <a
		href="{@docRoot}sdk/index.html">Android SDK</a>.</p>
		No newline at end of file
		<h2>Go!</h2>
		<p>Get started by installing <a
		href="{@docRoot}sdk/index.html">Android Studio</a>—the official IDE for Android development,
		which includes the Android SDK tools. Then when you're ready to begin coding, follow the training
		for <a href="{@docRoot}training/basics/firstapp/index.html">Building Your First App</a>.</p>
		No newline at end of file

docs/html/sdk/index.jd

+2 −2

Original line number	Diff line number	Diff line
		page.title=Android Studio
		page.title=Download Android Studio and SDK Tools
		page.tags=download
		page.template=sdk
		header.hide=1
		page.metaDescription=Download the official Android developer tools to build apps for Android phones, tablets, wearables, TVs, and more.
		page.metaDescription=Download the official Android IDE and developer tools to build apps for Android phones, tablets, wearables, TVs, and more.

		studio.version=1.0.0

docs/html/tools/studio/index.jd

+1 −1

Original line number	Diff line number	Diff line
		page.title=Android Studio
		page.title=Android Studio Overview
		@jd:body

		<div id="qv-wrapper">

docs/html/tools/workflow/index.jd

+4 −4

Original line number	Diff line number	Diff line
		page.title=Introduction
		page.title=Developer Workflow
		@jd:body

		<p>To develop apps for Android devices, you use a set of tools that are included in the Android SDK.
		Once you've downloaded Android Studio and the Android SDK tools you can access these tools directly.
		You can also access most of the SDK tools from the command line. Developing with Android Studio is the
		<p>To develop apps for Android, you use a set of tools that are included in Android Studio.
		In addition to using the tools from Android Studio,
		you can also access most of the SDK tools from the command line. Developing with Android Studio is the
		preferred method because it can directly invoke the tools that you need while developing applications.</p>

		<p>However, you may choose to develop with another IDE or a simple text editor and invoke the