summaryrefslogtreecommitdiffstats
path: root/docs/html/preview/setup-sdk.jd
diff options
context:
space:
mode:
Diffstat (limited to 'docs/html/preview/setup-sdk.jd')
-rw-r--r--docs/html/preview/setup-sdk.jd62
1 files changed, 17 insertions, 45 deletions
diff --git a/docs/html/preview/setup-sdk.jd b/docs/html/preview/setup-sdk.jd
index d3327e8..a4d9418 100644
--- a/docs/html/preview/setup-sdk.jd
+++ b/docs/html/preview/setup-sdk.jd
@@ -16,56 +16,30 @@ page.image=images/cards/card-set-up_16-9_2x.png
</div>
</div>
-<p>The M Developer Preview SDK is available from the Android SDK Manager.
-This document assumes that you are familiar with Android app development, such
+<p>With Developer Preview 3, the official Android 6.0 SDK is now available from the Android SDK
+Manager. This document assumes that you are familiar with Android app development, such
as using the Android SDK Manager and creating projects. If you are new to
Android, see <a href="{@docRoot}training/basics/firstapp/index.html">Building Your First
-App</a> training lesson first.</a></p>
+App</a> training lesson first.</p>
-<h2 id="get-as13">Get Android Studio 1.3</h2>
-
-<p>The Developer Preview is best used with Android Studio 1.3, which is in
-preview status. It is highly recommended that you install the preview version of
-Android Studio 1.3 to work with the Preview SDK.</p>
-
-<p class="caution"><strong>Caution:</strong> The canary preview of Android
-Studio 1.3 is still in active development. If you are using your primary development
-machine to test the developer preview, you can create a second installation
-of Android Studio to use for testing.</p>
-<p>To install the Android Studio 1.3 preview:</p>
-
-<ol>
- <li>Download and launch <a href="{@docRoot}tools/studio/index.html">Android
- Studio</a>.
- </li>
-
- <li>Open the <strong>Settings</strong> window (on Windows, you can do this
- by choosing <strong>File &gt; Settings</strong>). Choose the
- <strong>Appearance &amp; Behavior &gt; System
- Settings &gt; Updates</strong> panel.
-
- <p class="aside">On OSX, you can find the <strong>Appearance &amp;
- Behavior</strong> panel
- in Android Studio's <strong>Preferences</strong> window.</p>
- </li>
+<h2 id="get-as13">Get Android Studio 1.3</h2>
- <li> On the <strong>Updates</strong> panel, choose the option
- <strong>Automatically check updates for: Canary Channel</strong>.
- </li>
+<p>
+ The Developer Preview is best used with Android Studio 1.3. It is highly recommended that
+ you install the Android Studio 1.3 to work with the Preview SDK and the final Android 6.0 SDK
+ provided with Preview 3. Please update your Android Studio installation to version 1.3 or
+ higher, or follow the instructions for
+ <a href="{@docRoot}sdk/installing/index.html?pkg=studio">Installing Android Studio</a>.
+</p>
- <li>On the <strong>Updates</strong> panel, select <strong>Check Now</strong>
- to check for the latest canary build. Download and install the build when you
- are prompted.
- </li>
-</ol>
<h2 id="get-sdk">Get the Preview SDK</h2>
<p>To add the Preview SDK components to your development environment:</p>
<ol>
- <li>Launch the Android Studio 1.3 preview.
+ <li>Launch Android Studio 1.3 or higher.
</li>
<li>Open the <strong>Settings</strong> window (on Windows, you can do this
@@ -73,13 +47,12 @@ of Android Studio to use for testing.</p>
<strong>Appearance &amp; Behavior &gt; System
Settings &gt; Updates</strong> panel.
- <p class="aside">On OSX, you can find the <strong>Appearance &amp;
+ <p class="aside">On Mac OS X, you can find the <strong>Appearance &amp;
Behavior</strong> panel
in Android Studio's <strong>Preferences</strong> window.</p>
</li>
- <li>On the <strong>Updates</strong> panel, choose the options
- <strong>Automatically check updates for: Canary Channel</strong> and
+ <li>On the <strong>Updates</strong> panel, choose the option for
<strong>Automatically check updates for Android SDK: Preview Channel</strong>.
</li>
@@ -135,7 +108,7 @@ of Android Studio to use for testing.</p>
<ul>
<li>Check <strong>Phone and Tablet</strong>.</li>
- <li>Select <strong>MNC: Android M (Preview)</strong> in <strong>Minimum
+ <li>Select <strong>API 23: Android 6.0 (Marshmallow)</strong> in <strong>Minimum
SDK</strong>.</li>
</ul>
@@ -149,9 +122,8 @@ of Android Studio to use for testing.</p>
</p>
<ul>
- <li><code>compileSdkVersion</code> is set to <code>'android-MNC'</code></li>
- <li><code>minSdkVersion</code> is set to <code>'MNC'</code></li>
- <li><code>targetSdkVersion</code> is set to <code>'MNC'</code></li>
+ <li><code>compileSdkVersion</code> is set to <code>'23'</code></li>
+ <li><code>targetSdkVersion</code> is set to <code>'23'</code></li>
</ul>