From 8ac737db3761552df005a16a0323515468185124 Mon Sep 17 00:00:00 2001
From: "smain@google.com"
Date: Fri, 22 Apr 2016 15:27:28 -0700
Subject: [PATCH] Update the N Preview docs now that Studio 2.1 is stable. bug:
28342771
Change-Id: I73ee710928e4270ffe8212ca16b42d28b738949e
---
docs/html/preview/download.jd | 14 ++-----
docs/html/preview/j8-jack.jd | 2 +-
docs/html/preview/setup-sdk.jd | 70 ++++++----------------------------
3 files changed, 16 insertions(+), 70 deletions(-)
diff --git a/docs/html/preview/download.jd b/docs/html/preview/download.jd
index 629bd78fece76..b673fc151ff0d 100644
--- a/docs/html/preview/download.jd
+++ b/docs/html/preview/download.jd
@@ -468,18 +468,12 @@ for the Android N Preview.)
You can now launch the Android Emulator with the Android N Preview AVD.
-For the best experience in the Android Emulator, install
-Android Studio 2.1 Preview, which supports the Android Emulator 2.0 Beta
-with much faster performance compared to the Emulator in
+For the best experience in the Android Emulator, make sure you're using
+Android Studio 2.1 or higher, which supports Android Emulator 2.0
+with much faster performance compared to the emulator in
Android Studio 1.5.
-Note:
- If you're currently using Android Studio 2.0 Beta, there's a known issue
- that prevents you from creating AVDs with the N Preview system images, so
- you currently need to use the Android Studio 2.1 preview to create AVDs.
-
-
For more information about creating virtual devices, see Managing Virtual Devices.
diff --git a/docs/html/preview/j8-jack.jd b/docs/html/preview/j8-jack.jd
index 44e1af0de36c3..dc6beea764054 100644
--- a/docs/html/preview/j8-jack.jd
+++ b/docs/html/preview/j8-jack.jd
@@ -23,7 +23,7 @@ page.keywords="android N", "Java 8", "Jack"
To start using these features, you need to download and set up Android
-Studio 2.1 (preview) and the Android N Preview SDK, which includes the required
+Studio 2.1 and the Android N Preview SDK, which includes the required
Jack toolchain and updated Android Plugin for Gradle. If you haven't yet
installed the Android N Preview SDK, see Set Up to Develop for Android N.
diff --git a/docs/html/preview/setup-sdk.jd b/docs/html/preview/setup-sdk.jd
index 9e318cfeb9b8d..60568acf2cd15 100644
--- a/docs/html/preview/setup-sdk.jd
+++ b/docs/html/preview/setup-sdk.jd
@@ -32,7 +32,7 @@ href="{@docRoot}preview/download.html">Test on an Android N Device.
-Get Android Studio 2.1 (preview)
+Get Android Studio 2.1
The Android N platform adds support for Java 8 language features,
@@ -41,55 +41,14 @@ is currently supported only in Android Studio 2.1. So if you want to
use Java 8 language features, you need to use Android Studio 2.1 to
build your app. Otherwise, you don't need to use the Jack compiler, but you
still need to update to JDK 8 to compile against the Android N platform,
-as described below.
-
+as described below.
-
+If you already have Android Studio installed, make sure you have Android
+Studio 2.1 or higher by clicking Help > Check for Update
+(on Mac, Android Studio > Check for Updates).
-Android Studio 2.1 is currently available as a preview in the canary
-release channel. If you already
-have Android Studio and don't want to update to the canary channel, you can
-download Android Studio 2.1 as a separate installation and use it
-for development with Android N, leaving your primary Android Studio
-environment unaffected.
-
-To download Android Studio 2.1 as a separate installation, follow these
-steps (or if you want to receive Android Studio 2.1 as an update to your
-existing installation, skip to step 6):
-
-
- - Edit the name of your
- existing Android Studio installation and append the version number. This way,
- when you install the new version, it will not override the existing one.
- - Download the appropriate ZIP file for your operating system from the
- canary channel download page.
-
- - Unzip the package and move the Android Studio 2.1 contents to the
- appropriate location for applications on your system, then launch it.
- - In the setup wizard, click Next a couple times to
- reach the SDK Components Setup screen. Here,
- you must set a different path for the Android SDK Location.
- It can be any directory you want, but it must not be the default path, which
- is the same directory used by your original version of Android Studio (unless
- you changed that one yourself). The SDK location for Android Studio 2.1
- must be different because the N Preview SDK packages are not compatible with
- versions of Android Studio lower than 2.1.
-
- - Continue with the setup wizard until you reach the Android Studio IDE.
- - Open the Settings dialog
- (File > Settings on Windows/Linux, or
- Android Studio > Preferences on Mac). In the left
- panel, select Appearance & Behavior > System Settings >
- Updates.
-
- - On the Updates panel, select the Automatically
- check updates for check box and select
- Canary Channel from the drop-down list.
-
-
-
-Keep this settings window open for the next step.
+If you don't have it, download Android Studio
+2.1 here.
Get the N Preview SDK
@@ -98,17 +57,10 @@ existing installation, skip to step 6):
Android N Preview SDK in Android Studio as follows:
- - While still viewing the Updates panel (step 4 from above),
- select the Automatically
- check updates for Android SDK check box and select
- Preview Channel from the drop-down list.
-
- - Click Check Now.
+ - Open the SDK Manager by clicking Tools > Android >
+ SDK Manager.
- - In the left panel, select Appearance & Behavior >
- System Settings > Android SDK.
-
-
- Click the SDK Platforms tab, then select the
+
- In the SDK Platforms tab, select the
Android N Preview check box.
- Click the SDK Tools tab, then select the
@@ -199,7 +151,7 @@ how to configure your project with the Jack compiler.
android {
compileSdkVersion 'android-N'
- buildToolsVersion '24.0.0-rc1'
+ buildToolsVersion '24.0.0-rc3'
...
defaultConfig {