Update studio landing page and add all-new install flow docs.

bug: 27850063 (update system reqs for 2.0)
bug: 27725026 (update download page for 2.0)
bug: 23908299 (clean up download and get started)

depends on CL: Ibc4ddb4a6130ab8bd8d6044472022465829f2000

Change-Id: Id56ddec26e5701f69cd3e3ce7dc64cd28e98c8f3

5 files changed, 472 insertions, 766 deletions

diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd
index 10f89009d14f..0250c1e999f5 100644
--- a/docs/html/sdk/index.jd
+++ b/docs/html/sdk/index.jd
@@ -1,60 +1,80 @@
 page.title=Download Android Studio and SDK Tools
-page.tags="sdk, android studio,tools"
+page.tags=sdk, android studio
 page.template=sdk
-page.image=images/cards/android-studio_2x.png
+section.landing=true
 header.hide=1
+nonavpage=true
+fullpage=true
+page.image=images/cards/android-studio_2x.png
 page.metaDescription=Download the official Android IDE and developer tools to build apps for Android phones, tablets, wearables, TVs, and more.
 
 @jd:body
 
-<style type="text/css">
-  .offline {display:none;}
-  h2.feature {
-    padding-top:30px;
-    margin-top:0;
-    clear:both;
-  }
-  .feature-blurb {
-  margin:0px; font-size:16px; font-weight:300;
-  padding-top:40px;
-  }
-
-  .landing-button .small {
-    font-size: 12px;
-    font-weight: normal;
-    line-height: 12px;
-    display: block;
-  }
-
-  h1.studio-logo {
-    width:226px;
-    height:78px;
-    display:block;
-    padding:0;
-    white-space: nowrap;
-    text-indent: -10000px;
-    font-size:0px;
-    background: url(../images/tools/studio-logo.png);
-    background-image: -webkit-image-set(url(../images/tools/studio-logo.png) 1x, url(../images/tools/studio-logo_2x.png) 2x);
-    background-size: 226px 78px;
-  }
-
+<style>
+.download-bundle-button {line-height:18px;}
+.download-bundle-button .small {font-size: 12px; opacity: 0.7;}
 </style>
 
+ <section class="dac-expand dac-hero dac-light">
+  <div class="wrap">
+    <div class="cols dac-hero-content">
+      <div class="col-1of2 col-push-1of2 dac-hero-figure">
+        <img class="dac-hero-image" src="/images/develop/hero_image_studio5_2x.png" srcset="/images/develop/hero_image_studio5.png 1x, /images/develop/hero_image_studio5_2x.png 2x">
+      </div>
+      <div class="col-1of2 col-pull-1of2" style="margin-bottom:40px">
+<h1 class="dac-hero-title">Android Studio<br>
+<span style="font-size: 65%;">The Official IDE for Android</span></h1>
+
+<p class="dac-hero-description">Android Studio provides the fastest tools for
+building apps on every type of Android device.</p>
+
+<p class="dac-hero-description">World-class code editing, debugging,
+performance tooling, a flexible build system, and an instant build/deploy
+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>
+  <span class="small"></span></a>
+</p>
 
-
-
-
-<div style="position:relative;">
-
-
-<div class="wrap" id="tos" style="display:none;width:inherit;height:650px">
-<div class="col-13" style="margin:0;">&nbsp;</div><!-- provides top margin for content -->
-
-<h1 id="tos-header" style="margin-top:0">Download</h1>
-
-<p class="sdk-terms-intro">Before installing Android Studio or the standalone SDK tools,
-you must agree to the following terms and conditions.</p>
+<p style="margin:24px 0 0">
+  <a class="dac-hero-cta" href="{@docRoot}tools/studio/index.html">
+  <span class="dac-sprite dac-auto-chevron"></span>
+  Read the docs</a>
+  <a class="dac-hero-cta" href="{@docRoot}tools/revisions/studio.html">
+  <span class="dac-sprite dac-auto-chevron"></span>
+  See the release notes</a>
+</p>
+      </div>
+    </div>
+  </div>
+</section>
+
+
+
+
+<!-- start studio download modal -->
+<div data-modal="studio_tos" class="dac-modal" id="langform">
+  <div class="dac-modal-container">
+    <div class="dac-modal-window">
+      <header class="dac-modal-header">
+        <div class="dac-modal-header-actions">
+          <button class="dac-modal-header-close" data-modal-toggle></button>
+        </div>
+        <section class="dac-swap-section dac-active dac-down">
+          <h2 class="norule dac-modal-header-title" id="tos-header">Download Android Studio</h2>
+        </section>
+      </header>
+      <section class="dac-swap-section dac-active dac-left">
+          <section class="dac-modal-content">
+            <fieldset class="dac-form-fieldset">
+              <div class="cols">
+                <div class="col-2of2 tos-leftCol">
+                  <p class="sdk-terms-intro">Before downloading,
+                  you must agree to the following terms
+                  and conditions.</p>
+                </div>
 
 <div class="sdk-terms" onfocus="this.blur()">
 <h2 class="norule">Terms and Conditions</h2>
@@ -188,9 +208,7 @@ This is the Android Software Development Kit License Agreement
 14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
 
 <em>November 20, 2015</em>
-</div>
-
-
+</div><!-- close sdk-terms -->
 
 
 
@@ -198,243 +216,314 @@ This is the Android Software Development Kit License Agreement
   <p>You're just a few steps away from building apps for Android!</p>
   <p>In a moment, you'll be redirected to
   <a id="next-link" href="{@docRoot}sdk/installing/index.html">Installing the Android SDK</a>.</p>
-
 </div><!-- end next-steps -->
 
-
-
 <div id="sdk-terms-form">
 <p>
 <input id="agree" type="checkbox" name="agree" value="1" onclick="onAgreeChecked()" />
 <label id="agreeLabel" for="agree">I have read and agree with the above terms and conditions</label>
 </p>
 <p><a href="" class="dac-button dac-raised dac-primary disabled ndk" id="downloadForRealz" onclick="return onDownloadForRealz(this);"></a></p>
+</div><!-- end sdk-terms-form -->
+
+
+</div><!-- end cols -->
+
+            </fieldset>
+          </section>
+      </section>
+    </div><!-- end dac-modal-window -->
+  </div><!-- end dac-modal-container -->
+</div><!-- end #langform, .dac-modal -->
+<!-- end studio_tos modal -->
+
+<div id="useOldTemplates" class="actions-bar dac-expand dac-invert">
+  <div class="wrap dac-offset-parent">
+    <a class="dac-fab dac-scroll-button" data-scroll-button="" href="#features">
+      <i class="dac-sprite dac-arrow-down-gray"></i>
+    </a>
+    <div class="actions">
+      <div><a href="#features">
+        <span class="dac-sprite dac-auto-chevron-large"></span>
+        Features
+      </a></div>
+      <div><a href="#latest">
+        <span class="dac-sprite dac-auto-chevron-large"></span>
+        Latest
+      </a></div>
+      <div><a href="#resources">
+        <span class="dac-sprite dac-auto-chevron-large"></span>
+        Resources
+      </a></div>
+      <div><a href="#videos">
+        <span class="dac-sprite dac-auto-chevron-large"></span>
+        Videos
+      </a></div>
+      <div><a href="#downloads">
+        <span class="dac-sprite dac-auto-chevron-large"></span>
+        Download Options
+      </a></div>
+    </div><!-- end .actions -->
+  </div><!-- end .wrap -->
 </div>
 
 
-</div><!-- end TOS -->
-
-
-
-
-
-
-<div id="landing">
-
-<div class="col-13">&nbsp;</div><!-- provides top margin for content -->
-
-<img src="{@docRoot}images/tools/studio-hero.png"
-srcset="{@docRoot}images/tools/studio-hero_2x.png 2x, {@docRoot}images/tools/studio-hero.png 1x"
-width="760" alt="" />
-
-<div style="color: #fff; width:226px; height:0; overflow:visible; position:absolute; top:40px; left:25px">
-
-<h1 class="studio-logo" style="margin:0 0 35px !important;padding:0 !important">Android Studio</h1>
-
-<p style="font-size: 16px; color:#bbb; position: absolute;left: 297px; top: 5px; display: block;
-width: 400px;text-align: center;">The official Android IDE</p>
-
-<ul style="font-size:12px;line-height:19px;">
-<li>Android Studio IDE</li>
-<li>Android SDK tools</li>
-<li>Android 6.0 (Marshmallow) Platform</li>
-<li>Android 6.0 emulator system image with Google APIs</li>
-</ul>
-
-<a class="online landing-button green download-bundle-button"
-href="#Other" >Download Android Studio<br/><span class='small'></span></a>
-
-<!-- this appears when viewing the offline docs -->
-<p class="offline">
-To get Android Studio or stand-alone SDK tools, visit <a
-href="http://developer.android.com/sdk/index.html">developer.android.com/sdk/</a>
-</p>
+<div id="useUpdatedTemplates" style="display:none" class="dac-section dac-slim dac-gray dac-expand">
+  <div class="wrap dac-offset-parent">
+    <a class="dac-fab dac-scroll-button" data-scroll-button href="#features">
+      <i class="dac-sprite dac-arrow-down-gray"></i>
+    </a>
+    <ul class="dac-actions">
+      <li class="dac-action">
+        <a class="dac-action-link" href="#features">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          Features
+        </a>
+      </li>
+      <li class="dac-action">
+        <a class="dac-action-link" href="#latest">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          Latest
+        </a>
+      </li>
+      <li class="dac-action">
+        <a class="dac-action-link" href="#resources">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          Resources
+        </a>
+      </li>
+      <li class="dac-action">
+        <a class="dac-action-link" href="#videos">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          Videos
+        </a>
+      </li>
+      <li class="dac-action">
+        <a class="dac-action-link" href="#downloads">
+          <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i>
+          Download Options
+        </a>
+      </li>
+    </ul>
+  </div><!-- end .wrap -->
+</div><!-- end new templates -->
+
+
+
+<section id="features" class="dac-section dac-small">
+<div class="dac-toggle">
+
+<div class="wrap feature">
+  <div class="cols dac-hero-content">
+    <div class="col-1of2 col-push-1of2 dac-hero-figure">
+      <img src="/images/tools/studio/studio-feature-instant-run_2x.png">
+    </div>
+    <div class="col-1of2 col-pull-1of2">
+      <div class="dac-hero-tag"></div>
+      <h1 class="dac-hero-title">Instant Run</h1>
+<p class="dac-hero-description">Push code and resource
+changes to your app running on a device or emulator and see the
+changes instantly come to life.</p>
+<p class="dac-hero-description">Instant Run dramatically speeds up your edit,
+build, and run cycles, keeping you "in the flow."</p>
+      <a class="dac-hero-cta"
+        href="/tools/building/building-studio.html#instant-run">
+        <span class="dac-sprite dac-auto-chevron"></span>
+        Learn more</a>
+    </div>
+  </div>
 </div>
 
-<ul>
-  <li><a href="#Requirements">System Requirements</a></li>
-  <li><a href="#Other">Other Download Options</a></li>
-  <li><a href="{@docRoot}sdk/installing/migrate.html">Migrating to Android Studio</a></li>
-  <li><a href="https://www.google.com/intl/en/usability/index.html?l=9&reserved=0&pType=devel&productTag=0&campaignType=ghc&campaignDate=0&labelTag=0&referral_code=ASDWNLD">Participate in usability research</a></li>
-  <li><a href="https://docs.google.com/a/google.com/forms/d/1mjsyfzv3HAnDY-_Kfj-3QJKdpuksyMFs9e73CRwmT6Q/viewform"
-target="_blank">Take a Survey</a></li>
-</ul>
-
-
-
-
-<div class="cols">
-<h2 class="feature norule col-13">Intelligent code editor</h2>
-
-<div class="col-9">
-  <img src="{@docRoot}images/tools/studio-hero-code.png"
-srcset="{@docRoot}images/tools/studio-hero-code_2x.png 2x, {@docRoot}images/tools/studio-hero-code.png 1x" width="520" />
-</div><!-- end col-9 (left column) -->
-
-<div class="col-4 feature-blurb">
-  <p>At the core of Android Studio is an intelligent code editor capable of advanced
-  code completion, refactoring, and code analysis.</p>
-  <p>The powerful code editor helps you be a more productive Android app developer.</p>
+<div class="wrap feature">
+  <div class="cols dac-hero-content">
+    <div class="col-1of2 dac-hero-figure">
+      <img src="/images/tools/codeeditor-low.gif" >
+    </div>
+    <div class="col-1of2">
+      <div class="dac-hero-tag"></div>
+      <h1 class="dac-hero-title">Intelligent code editor</h1>
+<p class="dac-hero-description">Write better code, work faster, and be more productive with an intelligent code editor that helps you each step of the way.</p>
+<p class="dac-hero-description">Android Studio is built on IntelliJ and is capable of advanced code completion, refactoring, and code analysis.</p>
+    </div>
+  </div>
 </div>
 
-
-
-
-
-<h2 class="feature norule col-13">Code templates and GitHub integration</h2>
-
-<div class="col-9">
-  <img src="{@docRoot}images/tools/studio-hero-import.png"
-srcset="{@docRoot}images/tools/studio-hero-import_2x.png 2x, {@docRoot}images/tools/studio-hero-import.png 1x" width="520" />
-</div><!-- end col-9 (left column) -->
-
-<div class="col-4 feature-blurb">
-  <p>New project wizards make it easier than ever to start a new project.</p>
-
-  <p>Start projects using template code for patterns such as navigation drawer and view pagers,
-  and even import Google code samples from GitHub.</p>
+<div class="wrap feature">
+  <div class="cols dac-hero-content">
+    <div class="col-1of2 col-push-1of2 dac-hero-figure">
+      <img src="/images/tools/studio/studio-feature-emulator_2x.jpg">
+    </div>
+    <div class="col-1of2 col-pull-1of2">
+      <div class="dac-hero-tag"></div>
+      <h1 class="dac-hero-title">Fast and feature-rich emulator</h1>
+<p class="dac-hero-description">Install and run your apps faster than with a physical device and test your app on virtually any Android device configuration: Android phones, Android tablets, Android Wear, and Android TV devices.</p>
+<p class="dac-hero-description">The new Android Emulator 2.0 is faster than ever and allows you to dynamically resize the emulator and access a suite of sensor controls.</p>
+      <a class="dac-hero-cta"
+        href="/tools/devices/emulator.html">
+        <span class="dac-sprite dac-auto-chevron"></span>
+        Learn more</a>
+    </div>
+  </div>
 </div>
 
-
-
-
-<h2 class="feature norule col-13">Multi-screen app development</h2>
-
-<div class="col-9">
-  <img src="{@docRoot}images/tools/studio-hero-screens.png"
-srcset="{@docRoot}images/tools/studio-hero-screens_2x.png 2x, {@docRoot}images/tools/studio-hero-screens.png 1x" width="520" />
-</div><!-- end col-9 (left column) -->
-
-<div class="col-4 feature-blurb">
-  <p>Build apps for Android phones, tablets, Android Wear,
-  Android TV, Android Auto and Google Glass.</p>
-  <p>With the new Android Project View and module support in Android Studio, it's easier
-  to manage app projects and resources.
+<div class="wrap feature">
+  <div class="cols dac-hero-content">
+    <div class="col-1of2 dac-hero-figure">
+      <img src="/images/tools/studio/studio-feature-gradle_2x.png">
+    </div>
+    <div class="col-1of2">
+      <div class="dac-hero-tag"></div>
+      <h1 class="dac-hero-title">Robust and flexible build system</h1>
+<p class="dac-hero-description">Easily configure your project to include code libraries and generate multiple build variants from a single project.</p>
+<p class="dac-hero-description">With Gradle, Android Studio offers high-performance build automation, robust dependency management, and customizable build configurations.</p>
+      <a class="dac-hero-cta"
+        href="/tools/building/plugin-for-gradle.html">
+        <span class="dac-sprite dac-auto-chevron"></span>
+        Learn more</a>
+    </div>
+  </div>
 </div>
 
-
-
-
-<h2 class="feature norule col-13">Virtual devices for all shapes and sizes</h2>
-
-<div class="col-9">
-  <img src="{@docRoot}images/tools/studio-hero-avds.png"
-srcset="{@docRoot}images/tools/studio-hero-avds_2x.png 2x, {@docRoot}images/tools/studio-hero-avds.png 1x" width="520" />
-</div><!-- end col-9 (left column) -->
-
-<div class="col-4 feature-blurb">
-  <p>Android Studio comes pre-configured with an optimized emulator image.</p>
-  <p>The updated and streamlined Virtual Device Manager provides
-  pre-defined device profiles for common Android devices.</p>
+<div class="dac-toggle-content clearfix">
+
+<div class="wrap feature">
+  <div class="cols dac-hero-content">
+    <div class="col-1of2 col-push-1of2 dac-hero-figure">
+      <img src="/images/tools/studio/studio-feature-devices_2x.png">
+    </div>
+    <div class="col-1of2 col-pull-1of2">
+      <div class="dac-hero-tag"></div>
+      <h1 class="dac-hero-title">Develop for all&nbsp;<wbr>Android&nbsp;devices</h1>
+<p class="dac-hero-description">Target multiple form factors with a single
+project to easily share code among your different versions of your app.</p>
+<p class="dac-hero-description">Android Studio provides a unified environment
+to develop apps for Android phones, tablets, Android Wear, Android TV, and
+Android Auto.</p>
+
+      <a class="dac-hero-cta"
+        href="/tools/building/configuring-gradle.html#workBuildVariants">
+        <span class="dac-sprite dac-auto-chevron"></span>
+        Learn more</a>
+    </div>
+  </div>
 </div>
 
-
-
-
-<h2 class="feature norule col-13">
-Android builds evolved, with Gradle</h2>
-
-<div class="col-9">
-  <img src="{@docRoot}images/tools/studio-hero-gradle.png"
-srcset="{@docRoot}images/tools/studio-hero-gradle_2x.png 2x, {@docRoot}images/tools/studio-hero-gradle.png 1x" width="520" />
-</div><!-- end col-9 (left column) -->
-
-<div class="col-4 feature-blurb">
-  <p>Create multiple APKs for your Android app with different features using the same project.</p>
-  <p>Manage app dependencies with Maven.</p>
-  <p>Build APKs from Android Studio or the command line.</p>
+<div class="wrap feature">
+  <div class="cols dac-hero-content">
+    <div class="col-1of2 dac-hero-figure">
+      <img src="/images/tools/studio/studio-feature-github_2x.png">
+    </div>
+    <div class="col-1of2">
+      <div class="dac-hero-tag"></div>
+      <h1 class="dac-hero-title">Code templates and GitHub integration</h1>
+      <p class="dac-hero-description">Start projects with code templates for patterns such as navigation drawer and view pagers, or import Google code samples from GitHub.</p>
+      <p class="dac-hero-description">Android Studio's project wizards make it easier than ever to add code in a new project.</p>
+    </div>
+  </div>
 </div>
 
+</div><!-- end dac-toggle-content -->
+
+<div class="dac-section-links dac-text-center feature-more">
+  <div class="dac-section-link" data-toggle="section">
+    <span class="dac-toggle-expand">More
+      <i class="dac-sprite dac-auto-unfold-more"></i>
+    </span>
+    <span class="dac-toggle-collapse">Less
+      <i class="dac-sprite dac-auto-unfold-less"></i>
+    </span>
+  </div>
 </div>
 
-<h2 class="feature norule">More about Android Studio</h2>
-<div style="background:#424242;padding:30px; color:#fff;margin:0 0 15px;">
-
-<a class="online landing-button green download-bundle-button"
-style="margin:0 0 40px 60px;float:right"
-href="" >Download Android Studio</a>
-
-  <ul>
-  <li>Built on IntelliJ IDEA Community Edition, the popular Java IDE by JetBrains.</li>
-  <li>Flexible Gradle-based build system.</li>
-  <li>Build variants and multiple APK generation.</li>
-  <li>Expanded template support for Google Services and various device types.</li>
-  <li>Rich layout editor with support for theme editing.</li>
-  <li>Lint tools to catch performance, usability, version compatibility, and other problems.</li>
-  <li>ProGuard and app-signing capabilities.</li>
-  <li>Built-in support for Google Cloud Platform, making it easy to integrate Google Cloud
-  Messaging and App Engine.</li>
-  </ul>
-
-<p style="margin:0">
-For more details about features available in Android Studio,
-read the overview at <a href="{@docRoot}tools/studio/index.html">Android Studio</a>.</p>
 </div>
+</section><!-- end features -->
 
 
-<p>If you have been using Eclipse with ADT, be aware that Android Studio is now the official IDE
-for Android, so you should migrate to Android Studio to receive all the
-latest IDE updates. For help moving projects,
-see <a href="{@docRoot}sdk/installing/migrate.html">Migrating to Android
-Studio</a>.</p>
 
+<section id="latest" class="dac-section dac-light dac-small"><div class="wrap">
+  <h1 class="dac-section-title">Latest News</h1>
+  <div class="resource-widget resource-flow-layout col-16"
+       data-query="collection:tools/landing/latest"
+       data-cardSizes="6x6"
+       data-items-per-page="3"
+       data-initial-results="3"
+       data-maxResults="3"></div>
+  </div>
+</section>
 
+<section id="resources" class="dac-section dac-small"><div class="wrap">
+  <h1 class="dac-section-title">Resources</h1>
+  <div class="resource-widget resource-flow-layout col-16"
+       data-query="collection:tools/landing/resources"
+       data-cardSizes="6x6"
+       data-initial-results="3"
+       data-items-per-page="3"
+       data-maxResults="3"></div>
+  </div>
+</section>
 
+<section class="dac-section dac-light dac-small dac-gray" id="videos"><div class="wrap">
+  <h1 class="dac-section-title">Videos</h1>
+  <div class="resource-widget resource-flow-layout col-16"
+       data-query="collection:develop/landing/tools"
+       data-sortOrder="-timestamp"
+       data-cardSizes="6x6"
+       data-maxResults="3"></div>
+  </div>
+</section>
 
 
 
+<section id="Requirements" class="dac-section dac-light dac-small">
+<div class="wrap">
 
-<h2 id="Requirements">System Requirements</h2>
+<h2 class="norule">System Requirements</h2>
 
-<h3>Windows</h3>
+<div class="cols">
 
+<div class="col-2of6">
+<h4>Windows</h4>
 <ul>
-<li>Microsoft&reg;  Windows&reg;  8/7/Vista (32- or 64-bit)</li>
-<li>2 GB RAM minimum, 4 GB RAM recommended</li>
-<li>400 MB hard disk space</li>
-<li>At least 1 GB for Android SDK, emulator system images, and caches</li>
+<li>Microsoft&reg;  Windows&reg;  7/8/10 (32 or 64-bit)</li>
+<li>2 GB RAM minimum, 8 GB RAM recommended</li>
+<li>2 GB of available disk space minimum (500 MB for IDE + 1.5 GB for
+Android SDK and emulator system image). 4 GB Recommended.</li>
 <li>1280 x 800  minimum screen resolution</li>
-<li>Java Development Kit (JDK) 7 </li>
-<li>Optional for accelerated emulator: Intel® processor with support for Intel® VT-x, Intel® EM64T
-(Intel® 64), and Execute Disable (XD) Bit functionality</li>
+<li>Java Development Kit (JDK) 8</li>
+<li>Optional for accelerated emulator: Intel® processor with support for Intel®
+VT-x, Intel® EM64T (Intel® 64), and Execute Disable (XD) Bit functionality</li>
 </ul>
+</div>
 
-
-<h3>Mac OS X</h3>
-
+<div class="col-2of6">
+<h4>Mac</h4>
 <ul>
-<li>Mac&reg;  OS X&reg;  10.8.5 or higher, up to 10.9 (Mavericks)</li>
-<li>2 GB RAM minimum, 4 GB RAM recommended</li>
-<li>400 MB hard disk space</li>
-<li>At least 1 GB for Android SDK, emulator system images, and caches</li>
+<li>Mac&reg;  OS X&reg;  10.8.5 or higher, up to 10.11.4 (El Capitan)</li>
+<li>2 GB RAM minimum, 8 GB RAM recommended</li>
+<li>2 GB of available disk space minimum (500 MB for IDE + 1.5 GB for
+Android SDK and emulator system image). 4 GB Recommended.</li>
 <li>1280 x 800 minimum screen resolution</li>
-<li>Java Runtime Environment (JRE) 6</li>
-<li>Java Development Kit (JDK) 7</li>
+<li>Java Development Kit (JDK) 8</li>
 </ul>
+</div>
 
-<p>On Mac OS, run Android Studio with Java Runtime Environment (JRE) 6 for optimized font
-rendering. You can then configure your project to use Java Development Kit (JDK) 6 or JDK 7.</p>
-
-
-
-<h3>Linux</h3>
-
+<div class="col-2of6">
+<h4>Linux</h4>
 <ul>
-<li>GNOME or KDE desktop</li>
-<li>GNU C Library (glibc) 2.15 or later</li>
-<li>2 GB RAM minimum, 4 GB RAM recommended</li>
-<li>400 MB hard disk space</li>
-<li>At least 1 GB for Android SDK, emulator system images, and caches</li>
+<li>GNOME or KDE desktop
+<p><i>Tested on Ubuntu®  12.04, Precise Pangolin (64-bit distribution
+capable of running 32-bit applications)</i></li>
+<li>GNU C Library (glibc) 2.11 or later</li>
+<li>2 GB RAM minimum, 8 GB RAM recommended</li>
+<li>2 GB of available disk space minimum (500 MB for IDE + 1.5 GB for
+Android SDK and emulator system image). 4 GB Recommended.</li>
 <li>1280 x 800 minimum screen resolution</li>
-<li>Oracle&reg;  Java Development Kit (JDK) 7 </li>
-<li>64-bit distribution capable of running 32-bit applications</li>
+<li>Java Development Kit (JDK) 8</li>
 </ul>
-<p>Tested on Ubuntu&reg;  14.04, Trusty Tahr (64-bit distribution capable of running
-32-bit applications).</p>
-
-
+</div>
 
+</div>
+</div>
 
-<h2 id="Other" style="clear:left">Other Download Options</h2>
+</section>
 
-<!-- alternative SDK options follows -->
diff --git a/docs/html/sdk/installing/adding-packages.jd b/docs/html/sdk/installing/adding-packages.jd
deleted file mode 100644
index 70bb9fa19a97..000000000000
--- a/docs/html/sdk/installing/adding-packages.jd
+++ /dev/null
@@ -1,227 +0,0 @@
-page.title=Adding SDK Packages
-
-page.tags=sdk manager
-helpoutsWidget=true
-
-@jd:body
-
-<style>
-ol.large {
-  margin-left:0;
-}
-ol.large > li {
-  list-style-position: inside;
-  list-style-type:none;
-  margin:30px 0 0 0;
-  padding:30px 20px;
-  background:#eee;
-}
-ol.large > li:nth-child(odd) {
-}
-ol.large > li:before {
-  display:inline;
-  left:-40px;
-  float:left;
-  width:20px;
-  font-size:20px;
-  line-height:20px;
-}
-ol.large > li > h2 {
-  font-size:20px;
-  line-height:20px;
-  padding:0 0 0 20px;
-  margin:0 0 20px 0;
-  display:inline;
-  font-weight:normal;
-}
-ol.large > li:nth-child(1):before {
-  content:"1. ";
-}
-ol.large > li:nth-child(2):before {
-  content:"2. ";
-}
-ol.large > li:nth-child(3):before {
-  content:"3. ";
-}
-ol.large > li:nth-child(4):before {
-  content:"4. ";
-}
-ol.large > li:nth-child(5):before {
-  content:"5. ";
-}
-ol.large > li:nth-child(6):before {
-  content:"6. ";
-}
-</style>
-
-
-<p>
-By default, the Android SDK does not include everything you need to start developing.
-The SDK separates tools, platforms, and other components into packages you can
-download as needed using the
-<a href="{@docRoot}tools/help/sdk-manager.html">Android SDK Manager</a>.
-So before you can start, there are a few packages you should add to your Android SDK.</p>
-
-<p>To start adding packages, launch the Android SDK Manager in one of the following ways:</p>
-<ul>
-  <li>In Android Studio, click <strong>SDK Manager</strong>
-<img src="{@docRoot}images/tools/sdk-manager-studio.png"
-style="vertical-align:bottom;margin:0;height:17px" /> in the toolbar.</li>
-  <li>If you're not using Android Studio:
-    <ul>
-      <li>Windows: Double-click the <code>SDK Manager.exe</code> file at the root of the Android
-  SDK directory.</li>
-      <li>Mac/Linux: Open a terminal and navigate to the <code>tools/</code> directory in the
-      location where the Android SDK was installed, then execute <code>android sdk</code>.</li>
-    </ul>
-  </li>
-</ul>
-
-<p>When you open the SDK Manager for the first time, several packages are selected by
-default. Leave these selected, but be sure you have everything you need
-to get started by following these steps:</p>
-
-
-<ol class="large">
-<li>
-  <h2 id="GetTools" class="norule">Get the latest SDK tools</h2>
-
-  <p>As a minimum when setting up the Android SDK,
-  you should download the latest tools and Android platform:</p>
-  <ol>
-   <li>Open the Tools directory and select:
-     <ul>
-       <li><strong>Android SDK Tools</strong></li>
-       <li><strong>Android SDK Platform-tools</strong></li>
-       <li><strong>Android SDK Build-tools</strong> (highest version)</li>
-     </ul>
-   </li>
-   <li>Open the first Android X.X folder (the latest version) and select:
-     <ul>
-      <li><strong>SDK Platform</strong></li>
-      <li>A system image for the emulator, such as <br>
-      <strong>ARM EABI v7a System Image</strong></li>
-     </ul>
-   </li>
-  </ol>
-</li>
-
-<li>
-  <h2 id="GetSupportLib" class="norule">Get the support library for additional APIs</h2>
-
-  <div class="sidebox">
-    <p>The support library is required for:</p>
-    <ul>
-      <li><a href="{@docRoot}wear/index.html">Android Wear</a></li>
-      <li><a href="{@docRoot}tv/index.html">Android TV</a></li>
-      <li><a href="{@docRoot}google/play-services/cast.html">Google Cast</a></li>
-    </ul>
-
-    <p>It also provides these popular APIs:</p>
-    <ul>
-      <li><a href="{@docRoot}reference/android/support/v4/widget/DrawerLayout.html">Navigation
-      drawer</a></li>
-      <li><a href="{@docRoot}reference/android/support/v4/view/ViewPager.html">Swipe views</a></li>
-      <li><a href="{@docRoot}reference/android/support/v7/app/ActionBar.html">Backward-compatible
-      action bar</a></li>
-    </ul>
-  </div>
-
-  <p>The <a href="{@docRoot}tools/support-library/features.html">Android Support Library</a>
-  provides an extended set of APIs that are compatible with most versions of Android.</p>
-
-  <p>Open the <strong>Extras</strong> directory and select:</p>
-     <ul>
-       <li><strong>Android Support Repository</strong></li>
-       <li><strong>Android Support Library</strong></li>
-     </ul>
-
-  <p>&nbsp;</p>
-  <p>&nbsp;</p>
-
-</li>
-
-
-<li>
-  <h2 id="GetGoogle" class="norule">Get Google Play services for even more APIs</h2>
-
-  <div class="sidebox">
-
-    <p>The Google Play services APIs provide a variety of features and services for your Android
-    apps, such as:</p>
-    <ul>
-      <li><a href="{@docRoot}google/play-services/plus.html">User authentication</a></li>
-      <li><a href="{@docRoot}google/play-services/maps.html">Google Maps</a></li>
-      <li><a href="{@docRoot}google/play-services/cast.html">Google Cast</a></li>
-      <li><a href="{@docRoot}google/play-services/games.html">Games achievements and
-      leaderboards</a></li>
-      <li><a href="{@docRoot}google/play-services/index.html">And much more</a></li>
-    </ul>
-  </div>
-
-  <p>To develop with Google APIs, you need the Google Play services package:</p>
-  <p>Open the <strong>Extras</strong> directory and select:</p>
-     <ul>
-       <li><strong>Google Repository</strong></li>
-       <li><strong>Google Play services</strong></li>
-     </ul>
-
-  <p class="note"><strong>Note:</strong> Google Play services APIs are not available on all
-  Android-powered devices, but are available on all devices with Google Play Store. To use these
-  APIs in the Android emulator, you must also install the the <strong>Google APIs</strong>
-  system image from the latest Android X.X directory in the SDK Manager.</p>
-</li>
-
-
-<li>
-  <h2 id="Install" class="norule">Install the packages</h2>
-  <p>Once you've selected all the desired packages, continue to install:</p>
-  <ol>
-   <li>Click <strong>Install X packages</strong>.</li>
-   <li>In the next window, double-click each package name on the left
-   to accept the license agreement for each.</li>
-   <li>Click <strong>Install</strong>.</li>
-  </ol>
-  <p>The download progress is shown at the bottom of the SDK Manager window.
-  <strong>Do not exit the SDK Manager</strong> or it will cancel the download.</p>
-</li>
-
-<li>
-  <h2 id="Build" class="norule">Build something!</h2>
-
-<p>With the above packages now in your Android SDK, you're ready to build apps
-for Android. As new tools and other APIs become available, simply launch the SDK Manager
-  to download the new packages for your SDK.</p>
-
-<p>Here are a few options for how you should proceed:</p>
-
-<div class="cols" style="padding:10px 0">
-<div class="col-4">
-<h3>Get started</h3>
-<p>If you're new to Android development, learn the basics of Android apps by following
-the guide to <strong><a href="{@docRoot}training/basics/firstapp/index.html"
->Building Your First App</a></strong>.</p>
-
-</div>
-<div class="col-4 box">
-<h3>Build for wearables</h3>
-<p>If you're ready to start building apps for Android wearables, see the guide to
-<strong><a href="{@docRoot}wear/preview/start.html">Building Apps for Android Wear</a></strong>.</p>
-
-</div>
-<div class="col-4 box">
-<h3>Use Google APIs</h3>
-<p>To start using Google APIs, such as Maps or
-Play Game services, see the guide to
-<strong><a href="{@docRoot}google/play-services/setup.html">Setting Up Google Play
-Services</a></strong>.</p>
-
-</div>
-</div><!-- end cols -->
-
-
-</li>
-
-</ol>
-
-
diff --git a/docs/html/sdk/installing/index.jd b/docs/html/sdk/installing/index.jd
index c47b9c3d6c6d..f776c9a2e27e 100644
--- a/docs/html/sdk/installing/index.jd
+++ b/docs/html/sdk/installing/index.jd
@@ -1,362 +1,199 @@
-page.title=Installing the Android SDK
+page.title=Install Android Studio
 excludeFromSuggestions=true
 
 page.tags=sdk tools
-helpoutsWidget=true
 
 @jd:body
 
-<style>
-p.paging-links {
-  margin:0 0 40px;
-}
-.paging-links .next-page-link {
-  right:initial;
-}
-.procedure-box {
-  padding:20px 20px 5px;
-  margin-bottom:1em;
-  background:#eee;
-}
-.landing-button {
-  min-width: 155px;
-  text-align: center;
-}
-</style>
-
-
-
-<!-- ################    STUDIO    ##################### -->
-<div id="studio" heading="Installing Android Studio" style="display:none">
-
-<p>Android Studio provides everything you need to start developing apps for Android, including
-the Android Studio IDE and the Android SDK tools.</p>
-
-<p class="note"><strong>Note:</strong> If you have not yet downloaded Android Studio, <a href="{@docRoot}sdk/index.html"
-><b>download</b></a> it now.</p>
-
-
-<p>Before installing Android Studio, make sure you have JDK 6 or higher installed&mdash;the JRE
-alone is not sufficient. When developing for Android 5.0 (API level 21) and higher, you will need to install JDK 7.
-To check if you have the correct version of the JDK installed, open a terminal and type <code>javac -version</code>.
-If the JDK is not available or the version is lower than version 6, download the
-<a href="http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html" class="external-link"
->Java SE Development Kit 7</a>.</p>
-
-
-<div class="procedure-box">
-
-<p id="instructions-toggle"
-style="float:right;font-size:13px"><a href='' onclick='showAll();return false;'
->[ Show instructions for all platforms ]</a></p>
-
-<div class="win docs" style="display:none">
-
-<p><b>To set up Android Studio on Windows:</b></p>
-  <ol>
-    <li>Launch the {@code .exe} file you downloaded.</li>
-    <li>Follow the setup wizard to install Android Studio and any necessary SDK tools.
-
-    <p>On some Windows systems, the launcher script does not find where the JDK is installed.
-      If you encounter this problem,
-      you need to set an environment variable indicating the correct location.</p>
-      <p>Select <strong>Start menu > Computer > System Properties >
-      Advanced System Properties</strong>. Then open <strong>Advanced tab > Environment
-      Variables</strong> and add a new system variable <code>JAVA_HOME</code> that points to
-      your JDK folder, for example <code>C:\Program Files\Java\jdk1.7.0_21</code>.</p>
-    </p>
-    </li>
-  </ol>
-
-
-<p>The individual tools and other SDK packages used by Android Studio are installed in a separate
-directory. If you need to access the tools directly, use a terminal to navigate to the location
-where they are installed. For example:</p>
-<p><code>\Users\&lt;user&gt;\sdk\</code></p>
-
-
-
-</div><!-- end windows -->
-
-
-<div class="mac docs" style="display:none">
-
-<p><b>To set up Android Studio on Mac OSX:</b></p>
-  <ol>
-    <li>Launch the {@code .dmg} file you downloaded.</li>
-    <li>Drag and drop Android Studio into the Applications folder.
-    <li>Open Android Studio and follow the setup wizard to install any necessary SDK tools.
-    </li>
-  </ol>
-
-<p>If you need to use the Android SDK tools from a command line,
-you can access them at:</p>
-<p><code>/Users/&lt;user>/Library/Android/sdk/</code></p>
-
-
-</div><!-- end mac -->
-
-
-<div class="linux docs" style="display:none">
-
-<p><b>To set up Android Studio on Linux:</b></p>
-
-  <ol>
-    <li>Unpack the {@code .zip} file you downloaded to an
-        appropriate location for your applications.
-    <li>To launch Android Studio, open a terminal, navigate to the {@code android-studio/bin/} directory,
-     and execute {@code studio.sh}.
-      <p>You may want to add {@code android-studio/bin/} to your PATH environmental
-      variable so that you can start Android Studio from any directory.</p>
-    </li>
-    <li>If the SDK is not already installed, follow the setup wizard to install the SDK and any
-    necessary SDK tools.
-    <p class="note"><strong>Note:</strong> To support 32-bit apps
-    on a 64-bit machine, you will need to install the ia32-libs,
-    lib32ncurses5-dev, and lib32stdc++6 packages.</p>
-    </li>
-  </ol>
-
-</div><!-- end linux -->
-</div><!-- end procedure box -->
-
-<p>You can now start developing apps in Android Studio! Later on, you may want to add packages or
-update them.</p>
-
-<p class="paging-links">
-<a href="{@docRoot}sdk/installing/adding-packages.html" class="next-page-link">
-Optional: Adding SDK Packages</a></p>
-
 
+<div style="float:right;margin:0 0 20px 20px;border:1px solid #ccc;padding:10px">
+<p><strong>Instructions for</strong></p>
+<select id="instructions-option" onchange="showInstructions(this.value)" style="padding:4px">
+  <option value="windows">Windows</option>
+  <option value="mac">Mac</option>
+  <option value="linux">Linux</option>
+</select> 
 </div>
-<!-- ################    END STUDIO    ##################### -->
-
-
-
-
-
-
-
 
+<p>Setting up Android Studio takes just a few clicks.</p>
 
-<!-- ################    JUST SDK TOOLS    ##################### -->
-<div id="tools" heading="Installing the Stand-alone SDK Tools" style="display:none">
+<p>While the <a href="{@docRoot}sdk/index.html">Android Studio download</a>
+completes, make sure you have JDK 8 or higher installed. To check which version
+you have, open a command line and type <code>javac -version</code>. If the JDK
+is not available or the version is lower than 1.8, download the <a href=
+"http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"
+class="external-link">Java SE Development Kit 8</a>.</p>
 
 
-<p>The stand-alone SDK Tools package does not include a complete Android development environment.
-It includes only the core SDK tools, which you can access from a command line or with a plugin
-for your favorite IDE (if available).</p>
-
-<p class="note"><strong>Note:</strong> If you have not yet downloaded the SDK tools, <a href="{@docRoot}sdk/index.html#Other"
-><b>download</b></a> them now. For a complete IDE and Android SDK package, we recommend <a href="{@docRoot}sdk/index.html"
-><b>downloading Android Studio</b></a>.</p>
-
-
-<div class="procedure-box">
-<p id="instructions-toggle"
-style="float:right;font-size:13px"><a href='' onclick='showAll();return false;'
->[ Show instructions for all platforms ]</a></p>
-
-<div class="win docs" style="display:none">
-
-<p><b>To get started on Windows:</b></p>
-
-<p>Your download package is an executable file that starts an installer. The installer checks your machine
-  for required tools, such as the proper Java SE Development Kit (JDK), and installs them if necessary.
-  The installer then saves the Android SDK Tools to a specified location.</p>
+<div id="system-windows" style="display:none">
 
+<p>To install Android Studio on Windows, proceed as follows:</p>
 <ol>
-<li>Double-click the {@code .exe} file to start the install.</li>
-<li>Make a note of the name and location where you saved the SDK on your system&mdash;you will need to
-refer to them later when using
-the SDK tools from the command line.</li>
-<li>Once the installation completes, the installer starts the Android SDK Manager.
-</li>
+  <li>Launch the <code>.exe</code> file you downloaded.</li>
+  <li>Follow the setup wizard to install Android Studio and any necessary SDK tools.
+
+  <p>On some Windows systems, the launcher script does not find where the JDK is installed.
+    If you encounter this problem,
+    you need to set an environment variable indicating the correct location.</p>
+    <p>Select <strong>Start menu > Computer > System Properties >
+    Advanced System Properties</strong>. Then open <strong>Advanced tab > Environment
+    Variables</strong> and add a new system variable <code>JAVA_HOME</code> that points to
+    your JDK folder, for example <code>C:\Program Files\Java\jdk1.7.0_21</code>.</p>
+  </p>
+  </li>
 </ol>
 
-</div>
-
+<p>That's it!
+The following video shows each step of the recommended setup procedure.</p>
 
+<video controls style="margin:20px 0" onclick="this.play()">
+  <source src="https://storage.googleapis.com/androiddevelopers/videos/studio-install-windows.mp4" type="video/mp4">
+</video>
 
-<div class="mac docs" style="display:none">
+<p>As new tools and other APIs become available, Android Studio will tell you
+with a pop-up, or you can check yourself by clicking <strong>Help &gt;
+Check for Update</strong>.</p>
 
-<p><b>To get started on Mac OSX:</b></p>
-
-<ol>
-<li>Unpack the {@code .zip} file you downloaded. By default, the file is unpacked
-into a directory named <code>android-sdk-mac_x86</code>.</li>
-<li>Move the directory to an appropriate location on your
-machine, such as a "Development" directory in your home directory.</li>
-<li>Make a note of the name and location of the SDK directory on your system&mdash;you will need to
-refer to them later when using the SDK tools from the command line.</li>
-</ol>
 
 </div>
+<!-- end windows -->
 
 
 
+<!-- #### MAC INSTRUCTIONS #### -->
 
-<div class="linux docs" style="display:none">
+<div id="system-mac" style="display:none">
 
-<p><b>To get started on Linux:</b></p>
+<p>To install Android Studio on your Mac, proceed as follows:</p>
 
 <ol>
-<li>Unpack the {@code .tgz} file you downloaded.</li>
-<li>Make a note of the name and location of the unpacked SDK directory on your system&mdash;you will need to
-refer to them later when using the SDK tools from the command line.</li>
+  <li>Launch the Android Studio DMG file.</li>
+  <li>Drag and drop Android Studio into the Applications folder, then launch
+    Android Studio.</li>
+  <li>Select whether you want to import previous Android Studio settings,
+    then click <strong>OK</strong>.</li>
+  <li>The Android Studio Setup Wizard will guide you though the rest of the
+    setup procedures in just a few clicks,
+    which includes downloading various Android SDK components
+    that are required for development.</li>
 </ol>
 
-<h5 id="Troubleshooting" style="margin-bottom:15px"><a href='' class="expandable"
-  onclick="toggleExpandable(this,'#UbuntuTrouble');return false;"
-  >Troubleshooting Ubuntu</a></h5>
-
-<div id="UbuntuTrouble" style="display:none">
-<ul>
-  <li>If you need help installing and configuring Java on your
-    development machine, you might find these resources helpful:
-    <ul>
-      <li><a href="https://help.ubuntu.com/community/Java">https://help.ubuntu.com/community/Java </a></li>
-      <li><a href="https://help.ubuntu.com/community/Java">https://help.ubuntu.com/community/JavaInstallation</a></li>
-    </ul>
-  </li>
-  <li>Here are the steps to install Java:
-    <ol>
-      <li><p>If you are running a 64-bit distribution on your development
-      machine, you need to install additional packages first. For Ubuntu 13.10 (Saucy Salamander)
-      and above, install the <code>libncurses5:i386</code>, <code>libstdc++6:i386</code>, and
-      <code>zlib1g:i386</code> packages using <code>apt-get</code>:</p>
-      <pre class="no-pretty-print">sudo dpkg --add-architecture i386
-sudo apt-get update
-sudo apt-get install libncurses5:i386 libstdc++6:i386 zlib1g:i386</pre>
-      <p>For earlier versions of Ubuntu, install the <code>ia32-libs</code> package using
-      <code>apt-get</code>:</p>
-      <pre class="no-pretty-print">apt-get install ia32-libs</pre>
-      </li>
-      <li>Next, install Java: <pre class="no-pretty-print">apt-get install sun-java6-jdk</pre></li>
-    </ol>
-  </li>
-</ul>
-</div><!-- end ubuntu trouble -->
-
-
-</div><!-- end linux -->
-</div><!-- end procedure box -->
+<p>That's it!
+The following video shows each step of the recommended setup procedure.</p>
 
+<video controls style="margin:20px 0" onclick="this.play()">
+  <source src="https://storage.googleapis.com/androiddevelopers/videos/studio-install-mac.mp4" type="video/mp4">
+</video>
 
-<p>Before you can begin developing apps with the Android SDK tools, you must install a few
-additional packages.</p>
-
-<p class="paging-links">
-<a href="{@docRoot}sdk/installing/adding-packages.html" class="next-page-link">
-Continue: Adding SDK Packages</a></p>
-
+<p>
+As new tools and other APIs become available, Android Studio will tell you
+with a pop-up, or you can check yourself by clicking <strong>Android Studio &gt;
+Check for Updates</strong>.</p>
 
 </div>
-<!-- ################    END JUST TOOLS    ##################### -->
-
+<!-- end mac -->
 
 
 
+<!-- #### LINUX INSTRUCTIONS #### -->
 
+<div id="system-linux" style="display:none">
 
 
+<p>To install Android Studio on Linux, proceed as follows:</p>
 
+<ol>
+  <li>Unpack the <code>.zip</code> file you downloaded to an
+      appropriate location for your applications, such as within
+      <code>/usr/local/</code> for your user profile, or <code>/opt/</code>
+      for shared users.
+  <li>To launch Android Studio, open a terminal,
+    navigate to the <code>android-studio/bin/</code> directory,
+   and execute <code>studio.sh</code>.
+    <p><strong>Tip:</strong>
+    Add <code>android-studio/bin/</code> to your <code>PATH</code> environment
+    variable so you can start Android Studio from any directory.</p>
+  </li>
+  <li>Select whether you want to import previous Android Studio settings
+    or not, then click <strong>OK</strong>.</li>
+  <li>The Android Studio Setup Wizard will guide you though the rest of the
+    setup procedures in just a few clicks,
+    which includes downloading various Android SDK components
+    that are required for development.</li>
+  </li>
+</ol>
 
+<p>That's it!
+The following video shows each step of the recommended setup procedure.</p>
 
-<!-- ################    DEFAULT    ##################### -->
+<video controls style="margin:20px 0" onclick="this.play()">
+  <source src="https://storage.googleapis.com/androiddevelopers/videos/studio-install-linux.mp4" type="video/mp4">
+</video>
 
+<p>As new tools and other APIs become available, Android Studio will tell you
+with a pop-up, or you can check yourself by clicking <strong>Help &gt;
+Check for Update</strong>.</p>
 
-<div id="default" style="display:none">
+  <p class="note"><strong>Note:</strong> To support 32-bit apps
+  on a 64-bit machine, you will need to install the ia32-libs,
+  lib32ncurses5-dev, and lib32stdc++6 packages.</p>
 
-<p>Select the SDK bundle you want to install:</p>
+</div><!-- end linux -->
 
-<div class="cols" style="margin:30px 0 60px">
 
-<div class="col-4">
-<a href="{@docRoot}sdk/installing/index.html?pkg=studio" class="landing-button landing-secondary">
-Android Studio
-</a>
-</div>
 
-<div class="col-4">
-<a href="{@docRoot}sdk/installing/index.html?pkg=tools" class="landing-button landing-secondary">
-Stand-alone SDK Tools
-</a>
-</div>
-</div>
 
-<p></p>
+<h2>Start building apps</h2>
 
-<div>
-<p></p>
+<div class="cols" style="padding:10px 0">
+<div class="col-2of6">
+<img src="{@docRoot}images/tools/studio/ic_devices_grey.png"
+  style="width:100%;background:#eee;margin:0" />
+<h3>Build your first app</h3>
+<p>Get started quickly and learn the basics of Android by following
+the guide to <strong><a href="{@docRoot}training/basics/firstapp/index.html"
+>Building Your First App</a></strong>.</p>
 
 </div>
+<div class="col-2of6">
+<img src="{@docRoot}images/tools/studio/ic_school_grey.png"
+  style="width:100%;background:#eee;margin:0" />
+<h3>Learn with Udacity</h3>
+<p>Ramp up on Android with interactive video training in the
+<strong><a href="https://www.udacity.com/course/developing-android-apps--ud853">Android Fundamentals Udacity course</a></strong>.</p>
 
 </div>
-<!-- ################    END DEFAULT    ##################### -->
-
-
-
+<div class="col-2of6">
+<img src="{@docRoot}images/tools/studio/ic_explore_grey.png"
+  style="width:100%;background:#eee;margin:0" />
+<h3>Explore Studio</h3>
+<p>Discover powerful Android Studio features and developer strategies in the
+<strong><a href="{@docRoot}tools/studio/index.html">Android Studio Introduction</a></strong>.</p>
 
+</div>
+</div><!-- end cols -->
 
 
 <script>
-
-// Show proper instructions based on downloaded SDK package
-var package = getUrlParam("pkg");
-if (package == "tools") {
-  // Show the SDK Tools (other IDE) instructions
-  $("h1").text($("#tools").attr('heading'));
-  $("#tools").show();
-} else if (package == "studio") {
-  // Show the Android Studio instructions
-  $("h1").text($("#studio").attr('heading'));
-  $("#studio").show();
-} else {
-  // Show the default page content so user can select their setup
-  $("#default").show();
-}
-
-// Show the proper instructions based on machine OS
-var $osDocs;
-if (navigator.appVersion.indexOf("Win")!=-1) {
-  $osDocs = $('.win');
-} else if (navigator.appVersion.indexOf("Mac")!=-1) {
-  $osDocs = $('.mac');
-} else if (navigator.appVersion.indexOf("Linux")!=-1) {
-  $osDocs = $('.linux');
-}
-
-if ($osDocs.length) {
-  // reveal only the docs for this OS
-  $osDocs.show();
-} else {
-  // not running a compatible OS, so just show all the docs
-  $('.docs').show();
-}
-
-
-/* Shows all the machine OS instructions */
-function showAll() {
-  $('.docs').show();
-  $("#instructions-toggle").hide();
-}
-
-/* Returns the value for the given URL parameter */
-function getUrlParam(param) {
-  var url = window.location.search.substring(1);
-  var variables = url.split('&');
-  for (var i = 0; i < variables.length; i++) {
-    var paramName = variables[i].split('=');
-    if (escape(paramName[0]) == param) {
-      return escape(paramName[1]);
-    }
+/** Show the appropriate instructions for user **/
+function showInstructions(system) {
+  $("[id^=system-]").hide(); // hide all of them first
+  if (system == "linux") {
+    $("#system-linux").show();
+  } else if (system == "mac") {
+    $("#system-mac").show();
+  } else {
+    $("#system-windows").show();
   }
+  $("select#instructions-option").val(system);
 }
 
-/* direct link to ubuntu troubleshooting */
-if ( document.location.href.indexOf('#UbuntuTrouble') > -1 ) {
-  $(".linux.docs").show();
-  toggleExpandable(this,'#UbuntuTrouble');
+// Get operating system based on the user agent, default windows
+var os = "windows";
+if (navigator.appVersion.indexOf("Linux")!=-1) {
+  os = "linux";
+} else if (navigator.appVersion.indexOf("Mac")!=-1) {
+  os = "mac";
 }
+showInstructions(os);
 </script>
diff --git a/docs/html/sdk/installing/studio-tips.jd b/docs/html/sdk/installing/studio-tips.jd
index 113388f40ea8..4cd6f8ce04bb 100644
--- a/docs/html/sdk/installing/studio-tips.jd
+++ b/docs/html/sdk/installing/studio-tips.jd
@@ -1,7 +1,8 @@
 page.title=Android Studio Tips and Tricks
 page.image=images/tools/studio-previewall.png
-page.tags="sdk", "studio", "android studio"
-meta.tags="studio"
+page.metaDescription=Tips to help you get started with Android Studio's most common tasks and productivity enhancements.
+page.tags=studio,tips
+meta.tags="studio", "tools"
 @jd:body
 
 <div id="qv-wrapper">
diff --git a/docs/html/sdk/sdk_vars.cs b/docs/html/sdk/sdk_vars.cs
index eb6144713286..449935e46e00 100644
--- a/docs/html/sdk/sdk_vars.cs
+++ b/docs/html/sdk/sdk_vars.cs
@@ -1,5 +1,6 @@
 <?cs
 set:studio.version='1.5.1.0' ?><?cs
+set:studio.release.date='April 4, 2016' ?><?cs
 
 
 set:studio.linux_bundle_download='android-studio-ide-141.2456560-linux.zip' ?><?cs
@@ -54,3 +55,8 @@ set:ndk.win32_download='android-ndk-r11c-windows-x86.zip' ?><?cs
 set:ndk.win32_bytes='728899082' ?><?cs
 set:ndk.win32_checksum='ff939bde6cd374eecbd2c3b2ad218697f9a5038c'
 ?>
+<?cs
+def:size_in_mb(bytes)
+  ?><?cs set:mb = bytes / 1024 / 1024
+  ?><?cs var:mb ?><?cs
+/def ?>