resolved conflicts for merge of 66189de6 to master
Change-Id: Id4a80013dd506bd1135dd931450ee2a08a4c77aa
diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd
index f2b42cf..3a30cb8 100644
--- a/docs/html/sdk/index.jd
+++ b/docs/html/sdk/index.jd
@@ -4,19 +4,27 @@
header.hide=1
page.metaDescription=Download the official Android developer tools to build apps for Android phones, tablets, wearables, TVs, and more.
-studio.version=0.8.14
+studio.version=1.0.0
-studio.linux_bundle_download=android-studio-ide-135.1538390-linux.zip
-studio.linux_bundle_bytes=176358193
-studio.linux_bundle_checksum=718356b49254f6c4e55c64b99164d311995205dd
+studio.linux_bundle_download=android-studio-ide-135.1629389-linux.zip
+studio.linux_bundle_bytes=243909934
+studio.linux_bundle_checksum=601a302f10cf8a22ba4216e0884a035bdfec38b3
-studio.mac_bundle_download=android-studio-ide-135.1538390-mac.zip
-studio.mac_bundle_bytes=176745627
-studio.mac_bundle_checksum=4070e6f6a44d042266f46f1f2f9ca3448ac23f8cd
+studio.mac_bundle_download=android-studio-ide-135.1629389.dmg
+studio.mac_bundle_bytes=245757810
+studio.mac_bundle_checksum=0d9e0e230ece9f2e696b1b076c36ee1e73edcf3c
-studio.win_bundle_download=android-studio-ide-135.1538390-windows.zip
-studio.win_bundle_bytes=177343814
-studio.win_bundle_checksum=b533480200ba893616c73b32477e66ebb357a1b3
+studio.win_bundle_exe_download=android-studio-bundle-135.1629389.exe
+studio.win_bundle_exe_bytes=852499624
+studio.win_bundle_exe_checksum=0c8a3b45385a698b43a47757fdd6a83ca837abd2
+
+studio.win_notools_exe_download=android-studio-ide-135.1629389.exe
+studio.win_notools_exe_bytes=262099808
+studio.win_notools_exe_checksum=bfc6e9397f72969bcb3db80c9abe3a205540c8ab
+
+studio.win_bundle_download=android-studio-ide-135.1629389-windows.zip
+studio.win_bundle_bytes=246241434
+studio.win_bundle_checksum=6951e678a41b94b6172276727537db8590be7270
@@ -325,18 +333,19 @@
-<h2 class="feature norule">
-Android builds evolved, with Gradle</h2>
+
+<h2 class="feature norule">Code templates and GitHub integration</h2>
<div class="col-9" style="margin:0 20px 0 0">
- <img src="{@docRoot}images/tools/studio-hero-gradle.png"
-srcset="{@docRoot}images/tools/studio-hero-gradle_2x.png 2x, {@docRoot}images/tools/studio-hero-gradle.png 1x" width="520" />
+ <img src="{@docRoot}images/tools/studio-hero-import.png"
+srcset="{@docRoot}images/tools/studio-hero-import_2x.png 2x, {@docRoot}images/tools/studio-hero-import.png 1x" width="520" />
</div><!-- end col-9 (left column) -->
<div class="col-4 feature-blurb">
- <p>Create multiple APKs for your Android app with different features using the same project.</p>
- <p>Manage app dependencies with Maven.</p>
- <p>Build APKs from Android Studio or the command line.</p>
+ <p>New project wizards make it easier than ever to start a new project.</p>
+
+ <p>Start projects using template code for patterns such as navigation drawer and view pagers,
+ and even import Google code samples from GitHub.</p>
</div>
@@ -375,19 +384,18 @@
-
-<h2 class="feature norule">Code templates and GitHub integration</h2>
+<h2 class="feature norule">
+Android builds evolved, with Gradle</h2>
<div class="col-9" style="margin:0 20px 0 0">
- <img src="{@docRoot}images/tools/studio-hero-import.png"
-srcset="{@docRoot}images/tools/studio-hero-import_2x.png 2x, {@docRoot}images/tools/studio-hero-import.png 1x" width="520" />
+ <img src="{@docRoot}images/tools/studio-hero-gradle.png"
+srcset="{@docRoot}images/tools/studio-hero-gradle_2x.png 2x, {@docRoot}images/tools/studio-hero-gradle.png 1x" width="520" />
</div><!-- end col-9 (left column) -->
<div class="col-4 feature-blurb">
- <p>New project wizards make it easier than ever to start a new project.</p>
-
- <p>Start projects using template code for patterns such as navigation drawer and view pagers,
- and even import Google code samples from GitHub.</p>
+ <p>Create multiple APKs for your Android app with different features using the same project.</p>
+ <p>Manage app dependencies with Maven.</p>
+ <p>Build APKs from Android Studio or the command line.</p>
</div>
diff --git a/docs/html/sdk/installing/index.jd b/docs/html/sdk/installing/index.jd
index b1d564e..d8f6365 100644
--- a/docs/html/sdk/installing/index.jd
+++ b/docs/html/sdk/installing/index.jd
@@ -113,7 +113,7 @@
<p><b>To set up Android Studio on Linux:</b></p>
<ol>
- <li>Unpack the downloaded Tar file, {@code android-studio-ide-<version>-linux.zip}, into an
+ <li>Unpack the downloaded Tar file, {@code android-studio-ide-<version>-linux.zip}, into an
appropriate location for your applications.
<li>To launch Android Studio, navigate to the {@code android-studio/bin/} directory
in a terminal and execute {@code studio.sh}.
@@ -155,8 +155,7 @@
<p>If you didn't download the SDK tools, go <a href="{@docRoot}sdk/index.html#Other"
><b>download the SDK now</b></a>,
-or switch to the <a href="{@docRoot}sdk/installing/index.html?pkg=adt">Eclipse ADT
-install</a> or <a href="{@docRoot}sdk/installing/index.html?pkg=studio">Android Studio
+or switch to the <a href="{@docRoot}sdk/installing/index.html?pkg=studio">Android Studio
install</a> instructions.</p>
@@ -208,7 +207,7 @@
<p><b>To get started on Linux:</b></p>
-<p>Unpack the {@code .zip} file you've downloaded. The SDK files are download separately to a
+<p>Unpack the {@code .zip} file you've downloaded. The SDK files are download separately to a
user-specified directory. </p>
<p>Make a note of the name and location of the SDK directory on your system—you will need to
@@ -328,7 +327,8 @@
<div id="default" style="display:none">
<p>If you haven't already, <b><a href="{@docRoot}sdk/index.html">download
-the Android SDK bundle for Android Studio or the stand-alone SDK Tools</a></b>. </p>
+the Android SDK bundle for Android Studio</a></b> or the
+<a href="{@docRoot}sdk/index.html#Other">stand-alone SDK Tools</a>. </p>
<p>Then, select which SDK bundle you want to install:</p>
diff --git a/docs/html/sdk/installing/migrate.jd b/docs/html/sdk/installing/migrate.jd
index 81d6f92..696552a 100644
--- a/docs/html/sdk/installing/migrate.jd
+++ b/docs/html/sdk/installing/migrate.jd
@@ -14,8 +14,8 @@
</div>
</div>
-<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
+<p>If you're currently using Eclipse with ADT, we recommend you migrate to
+<a href="{@docRoot}tools/studio/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>
diff --git a/docs/html/tools/debugging/debugging-studio.jd b/docs/html/tools/debugging/debugging-studio.jd
index b060457..e1d80b9 100644
--- a/docs/html/tools/debugging/debugging-studio.jd
+++ b/docs/html/tools/debugging/debugging-studio.jd
@@ -28,7 +28,7 @@
</ol>
<h2>See also</h2>
<ul>
-<li><a href="{@docRoot}tools/basics/index.html">
+<li><a href="{@docRoot}sdk/installing/studio-tips.html">
Android Studio Tips and Tricks</a></li>
<li><a href="{@docRoot}tools/debugging/index.html">Debugging</a></li>
<li><a href="{@docRoot}tools/help/monitor.html">Device Monitor</a></li>
diff --git a/docs/html/tools/eclipse/index.jd b/docs/html/tools/eclipse/index.jd
index cd39b23..5fc6f78 100644
--- a/docs/html/tools/eclipse/index.jd
+++ b/docs/html/tools/eclipse/index.jd
@@ -7,7 +7,7 @@
<h2>See also</h2>
<ol>
<li><a href="{@docRoot}tools/sdk/index.html">Downloading Android Studio</a></li>
- <li><a href="{@docRoot}tools/basics/index.html">Android Studio Basics</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>
@@ -26,8 +26,8 @@
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
-<a href="{@docRoot}tools/studio/basics.html">Android Studio basics.</a>
+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>
diff --git a/docs/html/tools/publishing/app-signing.jd b/docs/html/tools/publishing/app-signing.jd
index 6e64392..4265a63 100644
--- a/docs/html/tools/publishing/app-signing.jd
+++ b/docs/html/tools/publishing/app-signing.jd
@@ -206,7 +206,8 @@
</ol>
<p>You can also specify your signing settings in Gradle configuration files. For more information,
-see <a href="{@docRoot}tools/gradle/studio-build.html#configureSigning">Signing settings</a>.</p>
+see <a href="{@docRoot}tools/building/configuring-gradle.html#configureSigning">Configuring Gradle
+Builds</a>.</p>
diff --git a/docs/html/tools/publishing/preparing.jd b/docs/html/tools/publishing/preparing.jd
index b6b10fb..0b61aa7 100644
--- a/docs/html/tools/publishing/preparing.jd
+++ b/docs/html/tools/publishing/preparing.jd
@@ -85,7 +85,7 @@
Android Studio. For example, you can use Android Studio with the Gradle build files to compile, sign,
and optimize your application all at once. You can also configure the Gradle build files to do the
same when you build from the command line. For more details about using the Gradle build files, see
-<a href="{@docRoot}tools/gradle/studio-build.html">Building Your Project with Gradle</a>.</p>
+the <a href="{@docRoot}sdk/installing/studio-build.html">Build System</a> guide.</p>
<p>To prepare your application for release you typically perform five main tasks (see figure 2).
Each main task may include one or more smaller tasks depending on how you are releasing your
@@ -306,15 +306,16 @@
<code>.apk</code> file that is signed and optimized. The JDK includes the tools for signing the
<code>.apk</code> file (Keytool and Jarsigner); the Android SDK includes the tools for compiling and
optimizing the <code>.apk</code> file. If you are using Android Studio or you are using
-the Gradle build system from the command line, you can automate the entire build process. See
-<a href="{@docRoot}tools/gradle/studio-build.html">Building Your Project with Gradle</a>.</p>
+the Gradle build system from the command line, you can automate the entire build process.
+For more information about configuring Gradle builds, see
+<a href="{@docRoot}tools/building/configuring-gradle.html">Configuring Gradle Builds</a>.</p>
<h3>Building with Android Studio</h3>
<p>You can use the Gradle build system, integrated with Android Studio to build a release-ready
<code>.apk</code> file that is signed with your private key and optimized. To learn how to setup and
run builds from Android Studio, see
-<a href="{@docRoot}tools/gradle/studio-build.html">Building Your Project with Gradle</a>.</p>
+<a href="{@docRoot}tools/building/building-studio.html">Building and Running from Android Studio</a>.</p>
<p>The build process assumes that you have a certificate and private key
suitable for signing your application. If you do not have a suitable certificate and private key,
diff --git a/docs/html/tools/publishing/versioning.jd b/docs/html/tools/publishing/versioning.jd
index f56dbc3..4af6f30 100644
--- a/docs/html/tools/publishing/versioning.jd
+++ b/docs/html/tools/publishing/versioning.jd
@@ -96,7 +96,7 @@
<p>You define both of these version attributes in the
<code><manifest></code> element of the manifest file or the Gradle build file. See
-<a href="{@docRoot}tools/gradle/studio-build.html">Building Your Project with Gradle</a>.</p>
+<a href="{@docRoot}tools/building/configuring-gradle.html">Configuring Gradle Builds</a>.</p>
<p>Here's an example manifest that shows the <code>android:versionCode</code>
and <code>android:versionName</code> attributes in the
@@ -174,4 +174,4 @@
manifest element documentation and the <a
href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#ApiLevels">API Levels</a> document. For
Gradle build settings, see
-<a href="{@docRoot}tools/gradle/studio-build.html">Building Your Project with Gradle</a>.</p>
+<a href="{@docRoot}tools/building/configuring-gradle.html">Configuring Gradle Builds</a>.</p>
diff --git a/docs/html/tools/studio/index.jd b/docs/html/tools/studio/index.jd
index 25d8f0a4..9f743d2 100644
--- a/docs/html/tools/studio/index.jd
+++ b/docs/html/tools/studio/index.jd
@@ -18,7 +18,6 @@
<h2>See also</h2>
<ol>
<li><a href="{@docRoot}tools/sdk/index.html">Download Android Studio</a></li>
- <li><a href="{@docRoot}tools/basics/index.html">Android Studio</a></li>
<li><a href="http://wiki.jetbrains.net/intellij/Android">IntelliJ IDEA Android Tutorials</a></li>
<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="{@docRoot}tools/buildsystem/index.html">Build System</a></li>
@@ -165,7 +164,7 @@
modifying your app's core source files. To build an Android Studio project, see
<a href="{@docRoot}tools/building/building-studio.html">Building and Running from Android Studio</a>.
To configure custom build settings in an Android Studio project, see
-<a href="{@docRoot}tools/gradle/configuring-studio-builds.html">Configure Android Studio Builds</a>.</p>
+<a href="{@docRoot}tools/building/configuring-gradle.html">Configuring Gradle Builds</a>.</p>
<h3>Application ID for Package Identification </h3>