From 8e48332fa648f0f4bb9398e31ddddee227a59b38 Mon Sep 17 00:00:00 2001
From: "smain@google.com" <smain@google.com>
Date: Mon, 25 Apr 2016 10:59:59 -0700
Subject: [PATCH] Android Studio 2.1 release notes and downloads.

Change-Id: I6e97e5a692ab1a2737672e7a2e23644119117caa
(cherry picked from commit ec3e785d25c1e6edb19f5c0c47ccc0ac04a1980e)
---
 docs/html/sdk/index.jd              |  2 +-
 docs/html/sdk/sdk_vars.cs           | 36 ++++++++++++------------
 docs/html/tools/revisions/studio.jd | 43 +++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 18 deletions(-)

diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd
index ddc6e14bbbdab..94b7e559f8663 100644
--- a/docs/html/sdk/index.jd
+++ b/docs/html/sdk/index.jd
@@ -34,7 +34,7 @@ system all allow you to focus on building unique and high quality apps.</p>
 
 <p style="margin-top:24px">
   <a class="landing-button green download-bundle-button"
-    data-modal-toggle="studio_tos">Download Android Studio 2.0<br>
+    data-modal-toggle="studio_tos">Download Android Studio 2.1<br>
   <span class="small"></span></a>
 </p>
 
diff --git a/docs/html/sdk/sdk_vars.cs b/docs/html/sdk/sdk_vars.cs
index 9f220d764ba78..6e58ddd54b5ec 100644
--- a/docs/html/sdk/sdk_vars.cs
+++ b/docs/html/sdk/sdk_vars.cs
@@ -1,27 +1,28 @@
 <?cs
-set:studio.version='2.0.0.20' ?><?cs
-set:studio.release.date='April 7, 2016' ?><?cs
+set:studio.version='2.1.0.9' ?><?cs
+set:studio.release.date='April 26, 2016' ?><?cs
 
 
-set:studio.linux_bundle_download='android-studio-ide-143.2739321-linux.zip' ?><?cs
-set:studio.linux_bundle_bytes='292106971' ?><?cs
-set:studio.linux_bundle_checksum='b64070ee4ec4868e9dd942b56f76864634cb0c67' ?><?cs
+set:studio.linux_bundle_download='android-studio-ide-143.2790544-linux.zip' ?><?cs
+set:studio.linux_bundle_bytes='298122012' ?><?cs
+set:studio.linux_bundle_checksum='45dad9b76ad0506c354483aaa67ea0e2468d03a5' ?><?cs
 
-set:studio.mac_bundle_download='android-studio-ide-143.2739321-mac.dmg' ?><?cs
-set:studio.mac_bundle_bytes='292574501' ?><?cs
-set:studio.mac_bundle_checksum='0f3d53a08815c00912c13738abc79e82207b20ed' ?><?cs
+set:studio.mac_bundle_download='android-studio-ide-143.2790544-mac.dmg' ?><?cs
+set:studio.mac_bundle_bytes='298589307' ?><?cs
+set:studio.mac_bundle_checksum='d667d93ae2e4e0f3fc1b95743329a46222dbf11d' ?><?cs
 
-set:studio.win_bundle_download='android-studio-ide-143.2739321-windows.zip' ?><?cs
-set:studio.win_bundle_bytes='294612422' ?><?cs
-set:studio.win_bundle_checksum='705c00f52b715d6a845c97979ced6f9b1b3f11c6' ?><?cs
+set:studio.win_bundle_download='android-studio-ide-143.2790544-windows.zip' ?><?cs
+set:studio.win_bundle_bytes='300627540' ?><?cs
+set:studio.win_bundle_checksum='9689ba415e5f09e2dcf5263ea302e7b1d98a8fc6' ?><?cs
 
-set:studio.win_bundle_exe_download='android-studio-bundle-143.2739321-windows.exe' ?><?cs
-set:studio.win_bundle_exe_bytes='1223633080' ?><?cs
-set:studio.win_bundle_exe_checksum='c556debf40de6b5d6f6d65d169a64398e3380183' ?><?cs
+set:studio.win_bundle_exe_download='android-studio-bundle-143.2790544-windows.exe' ?><?cs
+set:studio.win_bundle_exe_bytes='1238568304' ?><?cs
+set:studio.win_bundle_exe_checksum='c6abe7980dbb7d1d9887f7341a2942c9e506f891' ?><?cs
+
+set:studio.win_notools_exe_download='android-studio-ide-143.2790544-windows.exe' ?><?cs
+set:studio.win_notools_exe_bytes='283804056' ?><?cs
+set:studio.win_notools_exe_checksum='a2065ba737ddcfb96f4921fee6a038278f46d2a7' ?><?cs
 
-set:studio.win_notools_exe_download='android-studio-ide-143.2739321-windows.exe' ?><?cs
-set:studio.win_notools_exe_bytes='277789224' ?><?cs
-set:studio.win_notools_exe_checksum='3e8c25bd7b7f3aa326f7b2a349c4d67c550d13ac' ?><?cs
 
 
 set:sdk.linux_download='android-sdk_r24.4.1-linux.tgz' ?><?cs
@@ -40,6 +41,7 @@ set:sdk.win_installer_bytes='151659917' ?><?cs
 set:sdk.win_installer_checksum='f9b59d72413649d31e633207e31f456443e7ea0b' ?><?cs
 
 
+
 set:ndk.mac64_download='android-ndk-r11c-darwin-x86_64.zip' ?><?cs
 set:ndk.mac64_bytes='772428792' ?><?cs
 set:ndk.mac64_checksum='4ce8e7ed8dfe08c5fe58aedf7f46be2a97564696' ?><?cs
diff --git a/docs/html/tools/revisions/studio.jd b/docs/html/tools/revisions/studio.jd
index 9579ae287591d..c4cbd6df04a51 100755
--- a/docs/html/tools/revisions/studio.jd
+++ b/docs/html/tools/revisions/studio.jd
@@ -49,9 +49,52 @@ select <strong>Android Studio > Check for updates</strong>).</p>
 <p>The sections below provide notes about successive releases of
 Android Studio, as denoted by revision number. </p>
 
+
 <div class="toggle-content open">
   <p><a href="#" onclick="return toggleContent(this)">
     <img src="{@docRoot}assets/images/styles/disclosure_up.png" class="toggle-content-img"
+      alt=""/>Android Studio v2.1.0</a> <em>(April 2016)</em>
+  </p>
+  <div class="toggle-content-toggleme">
+
+<p>The primary changes in this update provide support for development with the
+<a href="{@docRoot}preview/index.html">Android N Preview</a>.</p>
+
+<p>The Android N platform adds support for <a
+href="{@docRoot}preview/j8-jack.html">Java 8 language features</a>, which
+require a new experimental compiler called Jack. The latest version of Jack 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.</p>
+
+<p class="note"><strong>Note:</strong> <a
+href="{@docRoot}tools/building/building-studio.html#instant-run">Instant Run</a>
+is disabled when you enable the Jack compiler because they currently are not
+compatible.</p>
+
+<p>Although Android Studio 2.1 is now stable, the Jack compiler is still
+experimental and you must enable it with <a
+href="{@docRoot}preview/j8-jack.html#configuration">the <code>jackOptions</code>
+property</a> in your <code>build.gradle</code> file.</p>
+
+<p>Other than the changes to support the N Preview, Android Studio 2.1
+includes minor bug fixes and the following enhancements:</p>
+    <ul>
+      <li>The Java-aware C++ debugger is now enabled by default when you're
+using an N device or emulator and select <strong>Native</strong> debugger mode
+(in the <strong>Debugger</strong> tab for your run/debug configuration).</li>
+    </ul>
+    <p>For other build enhancements, including incremental Java compilation
+    and dexing-in-process,update your <a
+href="{@docRoot}tools/revisions/gradle-plugin.html">Android Plugin for
+Gradle</a> to version 2.1.0.</p>
+  </div>
+</div>
+
+
+
+<div class="toggle-content closed">
+  <p><a href="#" onclick="return toggleContent(this)">
+    <img src="{@docRoot}assets/images/styles/disclosure_down.png" class="toggle-content-img"
       alt=""/>Android Studio v2.0.0</a> <em>(April 2016)</em>
   </p>