Merge "docs: Quick fix to remove movie name from Notifications pix" into mnc-mr-docs
diff --git a/docs/html/index.jd b/docs/html/index.jd
index 2f67c58..129564c 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -23,7 +23,7 @@
         <h1 class="dac-hero-title">Android N Developer Preview</h1>
         <p class="dac-hero-description">
           Get ready for the next version of Android!
-          <strong>Test your apps</strong> on Nexus and other devices. Support new system
+          <strong>Test your apps</strong> on Nexus devices. Support new system
           behaviors to <strong>save power and memory</strong>.
           Extend your apps with <strong>multi-window UI</strong>,
           <strong>direct reply notifications</strong> and more.
diff --git a/docs/html/preview/api-overview.jd b/docs/html/preview/api-overview.jd
index 8310c18..7eba386 100644
--- a/docs/html/preview/api-overview.jd
+++ b/docs/html/preview/api-overview.jd
@@ -97,7 +97,7 @@
   <li> <strong>Template updates</strong>: We're updating notification templates to put a new emphasis on hero image and
 avatar. Developers will be able to take advantage of the new
 templates with minimal adjustments in their code.</li>
-  <li> <strong>Bundled notifications</strong>: The system can group messages together, for example by message topic, and display the group. A user can take actions, such as Dismiss or Archive, on them in place. If you’ve implemented notifications for Android Wear, you’ll already be familiar with this model. 
+  <li> <strong>Bundled notifications</strong>: The system can group messages together, for example by message topic, and display the group. A user can take actions, such as Dismiss or Archive, on them in place. If you’ve implemented notifications for Android Wear, you’ll already be familiar with this model.
   with this model. </li>
   <li> <strong>Direct reply</strong>: For real-time communication apps, the Android system supports inline replies
 so that users can quickly respond to an SMS or text message directly within the
@@ -118,7 +118,7 @@
 
 
 <p class="img-caption">
-  <strong>Figure 2.</strong> Bundled notifications and direct reply. 
+  <strong>Figure 2.</strong> Bundled notifications and direct reply.
 </p>
 
 <p>To learn how to implement the new features, see the <a href="{@docRoot}notification-updates.html">Notifications</a> guide.</p>
@@ -131,7 +131,7 @@
 <img src="{@docRoot}preview/images/quicksettings.png" style="padding-left:1.5em;">
 
 <p class="img-caption" style="padding-left:2em;">
-  <strong>Figure 3.</strong> Quick Settings tiles in the notification shade. 
+  <strong>Figure 3.</strong> Quick Settings tiles in the notification shade.
 </p>
 
 
@@ -160,7 +160,7 @@
 <img src="{@docRoot}preview/images/datasaver.png" style="border:2px solid #ddd">
 
 <p class="img-caption" style="padding-right:2em;">
-  <strong>Figure 4.</strong> Data Saver in Settings. 
+  <strong>Figure 4.</strong> Data Saver in Settings.
 </p>
   </div>
 
@@ -326,7 +326,7 @@
 <p>Hardware-backed keystores provide a much safer method to create, store,
 and use cryptographic keys on Android devices. They protect keys from the
 Linux kernel, potential Android vulnerabilities, and extraction
-from rooted devices.</p> 
+from rooted devices.</p>
 
 <p>To make it easier and more secure to use hardware-backed keystores,
 Android N introduces Key Attestation. Apps and off-devices can use Key
@@ -568,7 +568,9 @@
 especially on low-memory devices.</p>
 
 <p>In Android N we're removing three commonly-used implicit broadcasts &mdash;
- {@link android.net.ConnectivityManager#CONNECTIVITY_ACTION}, <code>NEW_PICTURE</code>, and <code>NEW_VIDEO</code> &mdash; since those can wake the
+ {@link android.net.ConnectivityManager#CONNECTIVITY_ACTION}, {@link
+  android.hardware.Camera#ACTION_NEW_PICTURE}, and {@link
+  android.hardware.Camera#ACTION_NEW_VIDEO} &mdash; since those can wake the
 background processes of multiple apps at once and strain memory and battery. If
 your app is receiving these, take advantage of the N Developer Preview to
   migrate to <code>JobScheduler</code> and related APIs instead. </p>
diff --git a/docs/html/preview/behavior-changes.jd b/docs/html/preview/behavior-changes.jd
index b6ef1105..804480b 100644
--- a/docs/html/preview/behavior-changes.jd
+++ b/docs/html/preview/behavior-changes.jd
@@ -136,10 +136,11 @@
 </p>
 
 <p>
-  Similarly, apps can register to receive implicit {@code NEW_PICTURE} and
-  {@code NEW_VIDEO} broadcasts from other apps, such as Camera. When a user
-  takes a picture with the Camera app, these apps wake up to process the
-  broadcast.
+  Similarly, apps can register to receive implicit {@link
+  android.hardware.Camera#ACTION_NEW_PICTURE} and {@link
+  android.hardware.Camera#ACTION_NEW_VIDEO} broadcasts from other apps, such as
+  Camera. When a user takes a picture with the Camera app, these apps wake up
+  to process the broadcast.
 </p>
 
 <p>
@@ -152,13 +153,14 @@
   android.net.ConnectivityManager#CONNECTIVITY_ACTION} broadcasts, even if they
   have manifest entries to request notification of these events. Apps running
   in the foreground can still listen for {@code CONNECTIVITY_CHANGE} on their
-  main thread if they request notification with a
-  {@link android.content.BroadcastReceiver}.
+  main thread if they request notification with a {@link
+  android.content.BroadcastReceiver}.
   </li>
 
-  <li>Apps cannot send or receive {@code NEW_PICTURE} or {@code NEW_VIDEO}
-  broadcasts. This optimization affects all apps, not only those
-  targeting Android N.
+  <li>Apps cannot send or receive {@link
+  android.hardware.Camera#ACTION_NEW_PICTURE} or {@link
+  android.hardware.Camera#ACTION_NEW_VIDEO} broadcasts. This optimization
+  affects all apps, not only those targeting Android N.
   </li>
 </ul>
 
diff --git a/docs/html/preview/download.jd b/docs/html/preview/download.jd
index b08c4b2..3fe51fe 100644
--- a/docs/html/preview/download.jd
+++ b/docs/html/preview/download.jd
@@ -380,6 +380,11 @@
   </li>
 </ol>
 
+<p>You should now have <strong>Android SDK Built-Tools 24.0 0 rc1</strong>,
+<strong>Platform-Tools 24.0.0 rc1</strong>, and <strong>SDK Tools
+25.0.9</strong>. If you do not update the SDK Tools to 25.0.9, then you won't
+be able to run the x86_64 system images for Android N.</p>
+
 
 <p>Now create a virtual device with the Android N system image:</p>
 
@@ -399,13 +404,18 @@
 
 <p>You can now launch the Android Emulator with the Android N Preview AVD.</p>
 
-<p class="note"><strong>Note:</strong>
+<p>
 For the best experience in the Android Emulator, install
 Android Studio 2.1 Preview, which supports the <a
 href="http://tools.android.com/tech-docs/emulator">Android Emulator 2.0 Beta</a>
 with much faster performance compared to the Emulator in
 Android Studio 1.5.</p>
 
+<p class="note"><strong>Note:</strong>
+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.</p>
+
 <p>For more information about creating virtual devices, see <a href=
   "{@docRoot}tools/devices/index.html">Managing Virtual Devices</a>.
 </p>
diff --git a/docs/html/preview/features/background-optimization.jd b/docs/html/preview/features/background-optimization.jd
index 3fec187..4bcf785 100644
--- a/docs/html/preview/features/background-optimization.jd
+++ b/docs/html/preview/features/background-optimization.jd
@@ -65,9 +65,10 @@
   android.content.Context#registerReceiver Context.registerReceiver()}.
   </li>
 
-  <li>Apps cannot send or receive {@code NEW_PICTURE} or {@code NEW_VIDEO}
-  broadcasts. This optimization affects all apps, not only those targeting the
-  Preview.
+  <li>Apps cannot send or receive {@link
+  android.hardware.Camera#ACTION_NEW_PICTURE} or {@link
+  android.hardware.Camera#ACTION_NEW_VIDEO} broadcasts. This optimization
+  affects all apps, not only those targeting the Preview.
   </li>
 </ul>
 
@@ -194,8 +195,9 @@
 </h2>
 
 <p>
-  In the N Developer Preview, apps are not able to send or receive {@code
-  NEW_PICTURE} or {@code NEW_VIDEO} broadcasts. This restriction helps
+  In the N Developer Preview, apps are not able to send or receive {@link
+  android.hardware.Camera#ACTION_NEW_PICTURE} or {@link
+  android.hardware.Camera#ACTION_NEW_VIDEO} broadcasts. This restriction helps
   alleviate the performance and user experience impacts when several apps must
   wake up in order to process a new image or video. The N Developer Preview
   extends {@link android.app.job.JobInfo} and {@link
diff --git a/docs/html/preview/setup-sdk.jd b/docs/html/preview/setup-sdk.jd
index 29a9fa7..c8688c6 100644
--- a/docs/html/preview/setup-sdk.jd
+++ b/docs/html/preview/setup-sdk.jd
@@ -129,7 +129,7 @@
   </tr>
   <tr>
     <td style="white-space: nowrap">
-    <a href="https://storage.googleapis.com/androiddevelopers/preview/n-preview-1-docs.zip"
+    <a href="{@docRoot}shareables/preview/n-preview-1-docs.zip"
       >n-preview-1-docs.zip</a></td>
     <td width="100%">
       MD5: 4ab33ccbe698f46f125cc5b807cf9c2f<br>
@@ -191,7 +191,7 @@
 <pre>
 android {
   compileSdkVersion <strong>'android-N'</strong>
-  buildToolsVersion <strong>24.0.0</strong>
+  buildToolsVersion <strong>24.0.0 rc1</strong>
   ...
 
   defaultConfig {