Merge "Update the DP4 setup instruction for api level 24" into nyc-dev

docs/html/preview/setup-sdk.jd

@@ -76,19 +76,15 @@ Android N Preview SDK in Android Studio as follows:</p>
 
 <h3 id="docs-dl">Get the N Preview reference documentation</h3>
 
-<p class="note">
+<p>Beginning with the Preview 4 release, the API reference for the
-  <strong>Note:</strong> The N Preview (API level 24) reference documentation
+N platform (API level 24) is now available online at <a href=
-  is now available online at <a href=
   "{@docRoot}reference/">developer.android.com/reference/</a>.
 </p>
 
-<p>
+<p>If you'd like an offline copy of the API reference, you can download it
-  Detailed information about the Android N APIs is available in the N Preview
+from the following table. The download also includes an incremental diff report
-  reference documentation, which you can download from the following table.
+for API changes between the Preview 3 and Preview 4 release, which is not
-  This package contains an abridged, offline version of the Android developer
+available online.</p>
-  web site, and includes an updated API reference for the Android N APIs and an
-  API difference report.
-</p>
 
 <table>
   <tr>
@@ -97,11 +93,11 @@ Android N Preview SDK in Android Studio as follows:</p>
   </tr>
   <tr>
     <td style="white-space: nowrap">
-    <a href="{@docRoot}shareables/preview/n-preview-3-docs.zip"
+    <a href="{@docRoot}shareables/preview/n-preview-4-docs.zip"
-      >n-preview-3-docs.zip</a></td>
+      >n-preview-4-docs.zip</a></td>
     <td width="100%">
-      MD5: 19bcfd057a1f9dd01ffbb3d8ff7b8d81<br>
+      MD5: f853e3ba0707083336dfa780b8fed9a7<br>
-      SHA-1: 9224bd4445cd7f653c4c294d362ccb195a2101e7
+      SHA-1: 36fcbc497cc2e63b1bc1d629c304b0ba43a88946
     </td>
   </tr>
 </table>
@@ -137,9 +133,11 @@ you don't already have the latest version, download JDK 8 now.</p>
 
 <h2 id="create-update">Update or Create a Project</h2>
 
-<p>
+<p>Now that the N platform API level is "24" instead
-  To use the Android N APIs, your project must be configured appropriately.
+of "N", you can configure your projects normally with this API level (and even
-</p>
+publish your apps compiled with API 24 on Google Play). Just be sure that you've
+updated your project to use <strong>Android SDK Build Tools 24.0.0</strong> and
+<strong>Android SDK Platform-Tools 24.0.0</strong>.</p>
 
 <p>If you plan to use Java 8 language features, you should also read
 <a href="{@docRoot}preview/j8-jack.html">Java 8 Language Features</a>
@@ -156,18 +154,20 @@ how to configure your project with the Jack compiler.</p>
 
 <pre>
 android {
-  compileSdkVersion <strong>'android-N'</strong>
+  compileSdkVersion <strong>24</strong>
-  buildToolsVersion <strong>'24.0.0-rc3'</strong>
+  buildToolsVersion <strong>'24.0.0'</strong>
   ...
 
   defaultConfig {
-     minSdkVersion <strong>'N'</strong>
+     targetSdkVersion <strong>24</strong>
-     targetSdkVersion <strong>'N'</strong>
      ...
   }
   ...
 }</pre>
 
+<p>Now that the API level 24 is final, you can compile against it and keep your
+<code>minSdkVersion</code> to whatever version is appropriate for your app.</p>
+
 
 <h3 id="create">Create a new project</h3>
 
@@ -176,12 +176,12 @@ android {
 
 <ol>
   <li>Click <strong>File > New Project</strong>. and follow the steps until
-  you reach the Target Android Devices page.
+  you reach the <strong>Target Android Devices</strong> page.
   </li>
-  <li>On this page, select <strong>Phone and Tablet</strong> option.</li>
+  <li>On this page, select the <strong>Phone and Tablet</strong> check box.</li>
   <li>Under <strong>Phone and Tablet</strong> option, in the <strong>Minimum
     SDK</strong> option list, select
-    <strong>N: Android API 23, N Preview (Preview)</strong>.</li>
+    <strong>API 24: Android 6.X (N Preview)</strong>.</li>
 </ol>