Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev"

am: 1348277

* commit '1348277a292d976dbcfa2f4ea322fb93ac1a67e2':
  Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev"

Change-Id: I0ccd6993accfbb442ba8298b8d73db7c39b938a6

tools/droiddoc/templates-ndk/sdkpage.cs

@@ -80,13 +80,13 @@
       <th>Platform</th>
       <th>Package</th>
       <th style="white-space:nowrap">Size (Bytes)</th>
-      <th>SHA1 Checksum</th>
+      <th>MD5 Checksum</th>
   </tr>
   <tr>
     <td>Windows 32-bit</td>
     <td>
   <a onClick="return onDownload(this)"
-     href="http://dl.google.com/android/repository/<?cs var:ndk.win32_download ?>"><?cs var:ndk.win32_download ?></a>
+     href="http://dl.google.com/android/ndk/<?cs var:ndk.win32_download ?>"><?cs var:ndk.win32_download ?></a>
     </td>
     <td><?cs var:ndk.win32_bytes ?></td>
     <td><?cs var:ndk.win32_checksum ?></td>
@@ -94,7 +94,7 @@
  <!-- <tr>
    <td>
   <a onClick="return onDownload(this)"
-     href="http://dl.google.com/android/repository/<?cs var:ndk.win32.legacy_download ?>"><?cs var:ndk.win32.legacy_download ?></a>
+     href="http://dl.google.com/android/ndk/<?cs var:ndk.win32.legacy_download ?>"><?cs var:ndk.win32.legacy_download ?></a>
     </td>
     <td><?cs var:ndk.win32.legacy_bytes ?></td>
     <td><?cs var:ndk.win32.legacy_checksum ?></td>
@@ -103,7 +103,7 @@
     <td>Windows 64-bit</td>
     <td>
   <a onClick="return onDownload(this)"
-     href="http://dl.google.com/android/repository/<?cs var:ndk.win64_download ?>"><?cs var:ndk.win64_download ?></a>
+     href="http://dl.google.com/android/ndk/<?cs var:ndk.win64_download ?>"><?cs var:ndk.win64_download ?></a>
     </td>
     <td><?cs var:ndk.win64_bytes ?></td>
     <td><?cs var:ndk.win64_checksum ?></td>
@@ -111,7 +111,7 @@
  <!--  <tr>
     <td>
   <a onClick="return onDownload(this)"
-     href="http://dl.google.com/android/repository/<?cs var:ndk.win64.legacy_download ?>"><?cs var:ndk.win64.legacy_download ?></a>
+     href="http://dl.google.com/android/ndk/<?cs var:ndk.win64.legacy_download ?>"><?cs var:ndk.win64.legacy_download ?></a>
     </td>
     <td><?cs var:ndk.win64.legacy_bytes ?></td>
     <td><?cs var:ndk.win64.legacy_checksum ?></td>
@@ -120,7 +120,7 @@
     <td>Mac OS X 32-bit</td>
     <td>
   <a onClick="return onDownload(this)"
-     href="http://dl.google.com/android/repository/<?cs var:ndk.mac32_download ?>"><?cs var:ndk.mac32_download ?></a>
+     href="http://dl.google.com/android/ndk/<?cs var:ndk.mac32_download ?>"><?cs var:ndk.mac32_download ?></a>
     </td>
     <td><?cs var:ndk.mac32_bytes ?></td>
     <td><?cs var:ndk.mac32_checksum ?></td>
@@ -128,7 +128,7 @@
  <!--  <tr>
     <td>
   <a onClick="return onDownload(this)"
-     href="http://dl.google.com/android/repository/<?cs var:ndk.mac32.legacy_download ?>"><?cs var:ndk.mac32.legacy_download ?></a>
+     href="http://dl.google.com/android/ndk/<?cs var:ndk.mac32.legacy_download ?>"><?cs var:ndk.mac32.legacy_download ?></a>
     </td>
     <td><?cs var:ndk.mac32.legacy_bytes ?></td>
     <td><?cs var:ndk.mac32.legacy_checksum ?></td>
@@ -136,7 +136,7 @@
     <td>Mac OS X 64-bit</td>
     <td>
   <a onClick="return onDownload(this)"
-     href="http://dl.google.com/android/repository/<?cs var:ndk.mac64_download ?>"><?cs var:ndk.mac64_download ?></a>
+     href="http://dl.google.com/android/ndk/<?cs var:ndk.mac64_download ?>"><?cs var:ndk.mac64_download ?></a>
     </td>
     <td><?cs var:ndk.mac64_bytes ?></td>
     <td><?cs var:ndk.mac64_checksum ?></td>
@@ -144,15 +144,24 @@
  <!--  <tr>
     <td>
   <a onClick="return onDownload(this)"
-     href="http://dl.google.com/android/repository/<?cs var:ndk.mac64.legacy_download ?>"><?cs var:ndk.mac64.legacy_download ?></a>
+     href="http://dl.google.com/android/ndk/<?cs var:ndk.mac64.legacy_download ?>"><?cs var:ndk.mac64.legacy_download ?></a>
     </td>
     <td><?cs var:ndk.mac64.legacy_bytes ?></td>
     <td><?cs var:ndk.mac64.legacy_checksum ?></td>
   </tr> -->
+  <tr>
+    <td>Linux 32-bit (x86)</td>
+    <td>
+  <a onClick="return onDownload(this)"
+     href="http://dl.google.com/android/ndk/<?cs var:ndk.linux32_download ?>"><?cs var:ndk.linux32_download ?></a>
+    </td>
+    <td><?cs var:ndk.linux32_bytes ?></td>
+    <td><?cs var:ndk.linux32_checksum ?></td>
+  </tr>
  <!--  <tr>
     <td>
   <a onClick="return onDownload(this)"
-     href="http://dl.google.com/android/repository/<?cs var:ndk.linux32.legacy_download ?>"><?cs var:ndk.linux32.legacy_download ?></a>
+     href="http://dl.google.com/android/ndk/<?cs var:ndk.linux32.legacy_download ?>"><?cs var:ndk.linux32.legacy_download ?></a>
     </td>
     <td><?cs var:ndk.linux32.legacy_bytes ?></td>
     <td><?cs var:ndk.linux32.legacy_checksum ?></td>
@@ -161,7 +170,7 @@
     <td>Linux 64-bit (x86)</td>
     <td>
   <a onClick="return onDownload(this)"
-     href="http://dl.google.com/android/repository/<?cs var:ndk.linux64_download ?>"><?cs var:ndk.linux64_download ?></a>
+     href="http://dl.google.com/android/ndk/<?cs var:ndk.linux64_download ?>"><?cs var:ndk.linux64_download ?></a>
     </td>
     <td><?cs var:ndk.linux64_bytes ?></td>
     <td><?cs var:ndk.linux64_checksum ?></td>
@@ -169,7 +178,7 @@
   <!--  <tr>
     <td>
   <a onClick="return onDownload(this)"
-     href="http://dl.google.com/android/repository/<?cs var:ndk.linux64.legacy_download ?>"><?cs var:ndk.linux64.legacy_download ?></a>
+     href="http://dl.google.com/android/ndk/<?cs var:ndk.linux64.legacy_download ?>"><?cs var:ndk.linux64.legacy_download ?></a>
     </td>
     <td><?cs var:ndk.linux64.legacy_bytes ?></td>
     <td><?cs var:ndk.linux64.legacy_checksum ?></td>

tools/droiddoc/templates-sdk-dev/assets/css/fullscreen.css

@@ -14,7 +14,195 @@
 */
 
 @media screen, projection, print {
-  .wrap {
+.full {
-    max-width: none;
+	padding: 2.5em 0;
-  }
+	border-top: solid 1px #ddd;
+	border-bottom: solid 1px #ddd;
+	background: #f7f7f7;	
 }
+.wrap {
+	margin: 0 auto;
+	width: 100%;
+	min-width:600px;
+	clear: both;
+}
+.cols {
+    height: 1%;
+    margin: 0 -1.533742331288343558282%;
+    width: 103.06748466257669%}
+*+html .cols {
+    margin-bottom: 20px;
+}
+.cols:after {
+    clear: both;
+    content: ' ';
+    display: block;
+    height: 0;
+    visibility: hidden;
+}
+.col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12,
+.col-13, .col-14, .col-15, .col-16 {
+    float: left;
+    margin: 0 1.063829787234% 20px 1.063829787234%;
+}
+* html .col-1, * html .col-2, * html .col-3, * html .col-4, * html .col-5, * html .col-6, * html
+.col-7, * html .col-8, * html .col-9, * html .col-10, * html .col-11, * html .col-12, * html
+.col-13, * html .col-14, * html .col-15, * html .col-16  {
+    margin: 0;
+    margin: 0 1.063829787234% 20px 1.063829787234%;
+}
+[dir='rtl'] .col-1, [dir='rtl'] .col-2, [dir='rtl'] .col-3, [dir='rtl'] .col-4, [dir='rtl'] .col-5,
+[dir='rtl'] .col-6, [dir='rtl'] .col-7, [dir='rtl'] .col-8, [dir='rtl'] .col-9, [dir='rtl'] .col-10,
+[dir='rtl'] .col-11, [dir='rtl'] .col-12 {
+    float: right;
+}
+.col-1 {
+    width: 4.16666666666667%;
+}
+.col-2 {
+    width: 10.4166666666667%;
+}
+.col-3 {
+    width: 16.6666666666667%;
+}
+.col-4 {
+    width: 22.9166666666667%;
+}
+.col-5 {
+    width: 29.1666666666667%;
+}
+.col-6 {
+    width: 35.4166666666667%;
+}
+.col-7 {
+    width: 41.6666666666667%;
+}
+.col-8 {
+    width: 47.9166666666667%;
+}
+.col-9 {
+    width: 55.3333333333333%;
+}
+.col-10 {
+    width: 60.4166666666667%;
+}
+.col-11 {
+    width: 66.6666666666667%;
+}
+.col-12 {
+    width: 72.9166666666667%;
+}
+.col-13 {
+    width: 79.1666666666667%;
+}
+.col-14 {
+    width: 85.4166666666667%;
+}
+.col-15 {
+    width: 91.6666666666667%;
+}
+.col-16 {
+    width: 97.9166666666667%;
+}
+
+
+
+
+
+
+
+#header .col-1,
+#nav-x .col-1 { width: 40px }
+#header .col-2,
+#nav-x .col-2 { width: 100px }
+#header .col-3,
+#nav-x .col-3 { width: 160px }
+#header .col-4,
+#nav-x .col-4 { width: 220px }
+#header .col-5,
+#nav-x .col-5 { width: 280px }
+#header .col-6,
+#nav-x .col-6 { width: 340px }
+#header .col-7,
+#nav-x .col-7 { width: 400px }
+#header .col-8,
+#nav-x .col-8 { width: 460px }
+#header .col-9,
+#nav-x .col-9 { width: 520px }
+#header .col-10,
+#nav-x .col-10 { width: 580px }
+#header .col-11,
+#nav-x .col-11 { width: 640px }
+#header .col-12,
+#nav-x .col-12 { width: 700px }
+#header .col-13,
+#nav-x .col-13 { width: 760px }
+#header .col-14,
+#nav-x .col-14 { width: 820px }
+#header .col-15,
+#nav-x .col-15 { width: 880px }
+#header .col-16,
+#nav-x .col-16 { width: 940px }
+
+
+
+body {
+  padding:0 20px;
+}
+#header,
+#searchResults,
+#nav-x {
+  margin:0;
+}
+#body-content {
+  margin:0;
+}
+#body-content > .col-12 {
+  width:77.9804965%;
+  margin:0 0 0 0.97%; /* this percentage chosen to make IE9 happy */
+}
+#side-nav {
+  width: 19.9804965%;
+  margin:0 1.063829787234% 0 0;
+}
+
+#header .wrap {
+  max-width: 100%;
+}
+
+#header-wrapper #nav-x div.wrap,
+#searchResults.wrap {
+    max-width:100%;
+}
+
+.nav-x {
+  margin:-2px 0 0 0;
+}
+
+#devdoc-nav.fixed,
+#devdoc-nav.fixed a.totop {
+  left:20px; /* !important ... for IE i think */
+}
+
+#sticky-header {
+  padding: 0 20px;
+}
+
+#sticky-header > div {
+  width: 100%;
+}
+
+.sticky-menu {
+  width:100%;
+  left:-20px;
+}
+
+.col-right {
+  margin-right:0px;
+}
+
+@media screen and (max-width:772px) {
+.col-5, .col-6, .col-7 {
+    clear: both;
+    width: 97.0238096%}
+}

tools/droiddoc/templates-sdk-dev/assets/js/android_3p-bundle.js

@@ -2763,10 +2763,4 @@ jQuery.effects||function(a,b){function c(b){var c;return b&&b.constructor==Array
 * https://github.com/jquery/jquery-ui
 * Includes: jquery.effects.transfer.js
 * Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
-(function(a,b){a.effects.transfer=function(b){return this.queue(function(){var c=a(this),d=a(b.options.to),e=d.offset(),f={top:e.top,left:e.left,height:d.innerHeight(),width:d.innerWidth()},g=c.offset(),h=a('<div class="ui-effects-transfer"></div>').appendTo(document.body).addClass(b.options.className).css({top:g.top,left:g.left,height:c.innerHeight(),width:c.innerWidth(),position:"absolute"}).animate(f,b.duration,b.options.easing,function(){h.remove(),b.callback&&b.callback.apply(c[0],arguments),c.dequeue()})})}})(jQuery);;
+(function(a,b){a.effects.transfer=function(b){return this.queue(function(){var c=a(this),d=a(b.options.to),e=d.offset(),f={top:e.top,left:e.left,height:d.innerHeight(),width:d.innerWidth()},g=c.offset(),h=a('<div class="ui-effects-transfer"></div>').appendTo(document.body).addClass(b.options.className).css({top:g.top,left:g.left,height:c.innerHeight(),width:c.innerWidth(),position:"absolute"}).animate(f,b.duration,b.options.easing,function(){h.remove(),b.callback&&b.callback.apply(c[0],arguments),c.dequeue()})})}})(jQuery);;
-/*! (c) 2012 Airbnb, Inc.
-*
-* polyglot.js 0.4.3 may be freely distributed under the terms of the BSD
-* license. For all licensing information, details, and documention:
-* http://airbnb.github.com/polyglot.js */
-(function(e,t){typeof define=="function"&&define.amd?define([],function(){return t(e)}):typeof exports=="object"?module.exports=t(e):e.Polyglot=t(e)})(this,function(e){"use strict";function t(e){e=e||{},this.phrases={},this.extend(e.phrases||{}),this.currentLocale=e.locale||"en",this.allowMissing=!!e.allowMissing,this.warn=e.warn||c}function s(e){var t,n,r,i={};for(t in e)if(e.hasOwnProperty(t)){n=e[t];for(r in n)i[n[r]]=t}return i}function o(e){var t=/^\s+|\s+$/g;return e.replace(t,"")}function u(e,t,r){var i,s,u;return r!=null&&e?(s=e.split(n),u=s[f(t,r)]||s[0],i=o(u)):i=e,i}function a(e){var t=s(i);return t[e]||t.en}function f(e,t){return r[a(e)](t)}function l(e,t){for(var n in t)n!=="_"&&t.hasOwnProperty(n)&&(e=e.replace(new RegExp("%\\{"+n+"\\}","g"),t[n]));return e}function c(t){e.console&&e.console.warn&&e.console.warn("WARNING: "+t)}function h(e){var t={};for(var n in e)t[n]=e[n];return t}t.VERSION="0.4.3",t.prototype.locale=function(e){return e&&(this.currentLocale=e),this.currentLocale},t.prototype.extend=function(e,t){var n;for(var r in e)e.hasOwnProperty(r)&&(n=e[r],t&&(r=t+"."+r),typeof n=="object"?this.extend(n,r):this.phrases[r]=n)},t.prototype.clear=function(){this.phrases={}},t.prototype.replace=function(e){this.clear(),this.extend(e)},t.prototype.t=function(e,t){var n,r;return t=t==null?{}:t,typeof t=="number"&&(t={smart_count:t}),typeof this.phrases[e]=="string"?n=this.phrases[e]:typeof t._=="string"?n=t._:this.allowMissing?n=e:(this.warn('Missing translation for key: "'+e+'"'),r=e),typeof n=="string"&&(t=h(t),r=u(n,this.currentLocale,t.smart_count),r=l(r,t)),r},t.prototype.has=function(e){return e in this.phrases};var n="||||",r={chinese:function(e){return 0},german:function(e){return e!==1?1:0},french:function(e){return e>1?1:0},russian:function(e){return e%10===1&&e%100!==11?0:e%10>=2&&e%10<=4&&(e%100<10||e%100>=20)?1:2},czech:function(e){return e===1?0:e>=2&&e<=4?1:2},polish:function(e){return e===1?0:e%10>=2&&e%10<=4&&(e%100<10||e%100>=20)?1:2},icelandic:function(e){return e%10!==1||e%100===11?1:0}},i={chinese:["fa","id","ja","ko","lo","ms","th","tr","zh"],german:["da","de","en","es","fi","el","he","hu","it","nl","no","pt","sv"],french:["fr","tl","pt-br"],russian:["hr","ru"],czech:["cs"],polish:["pl"],icelandic:["is"]};return t});

tools/droiddoc/templates-sdk-dev/body_tag.cs

@@ -1,15 +0,0 @@
-<body class="gc-documentation <?cs
-  if:(reference.gms || reference.gcm)
-    ?>google<?cs
-  /if ?><?cs
-  if:(guide||develop||training||reference||tools||sdk)
-    ?>develop<?cs
-    if:reference
-      ?> reference api apilevel-<?cs var:class.since ?><?cs var:package.since ?><?cs
-    /if ?><?cs
-  elif:design
-    ?>design<?cs
-  elif:distribute
-    ?>distribute<?cs
-  /if ?>">
-<div id="doc-api-level" class="<?cs var:class.since ?><?cs var:package.since ?>" style="display:none"></div>

tools/droiddoc/templates-sdk-dev/classes.cs

@@ -1,27 +1,34 @@
-<?cs # THIS CREATES A LIST OF ALL PACKAGES AND NAMES IT packages.html ?>
+<?cs include:"doctype.cs" ?>
 <?cs include:"macros.cs" ?>
 <?cs include:"macros_override.cs" ?>
-<?cs include:"doctype.cs" ?>
 <html<?cs if:devsite ?> devsite<?cs /if ?>>
 <?cs include:"head_tag.cs" ?>
-<?cs include:"body_tag.cs" ?>
+<body class="gc-documentation <?cs if:(reference.gms || reference.gcm) ?>google<?cs /if ?>
+  <?cs if:(guide||develop||training||reference||tools||sdk) ?>develop<?cs
+    if:reference ?> reference<?cs
+    /if ?><?cs
+  elif:design ?>design<?cs
+  elif:distribute ?>distribute<?cs
+  /if ?>" itemscope itemtype="http://schema.org/Article">
+  <a name="top"></a>
 <?cs include:"header.cs" ?>
 
-<h1><?cs var:page.title ?></h1>
+<div class="col-12" id="doc-col">
-<p>These are the API classes. See all
-<a href="packages.html">API packages</a>.</p>
 
-<div class="jd-letterlist"><?cs
+<div id="jd-header">
-  each:letter=docs.classes ?>
+<h1><?cs var:page.title ?></h1>
-    <a href="#letter_<?cs name:letter ?>"><?cs
+</div>
-      name:letter ?></a>&nbsp;&nbsp;<?cs
+
-  /each?>
+<div id="jd-content">
+<p>These are the Android API classes. See all <a href="packages.html">API packages</a>.</p>
+<div class="jd-letterlist"><?cs each:letter=docs.classes ?>
+    <a href="#letter_<?cs name:letter ?>"><?cs name:letter ?></a>&nbsp;&nbsp;<?cs /each?>
 </div>
 
 <?cs each:letter=docs.classes ?>
 <?cs set:count = #1 ?>
 <h2 id="letter_<?cs name:letter ?>"><?cs name:letter ?></h2>
-<table>
+<table class="jd-sumtable">
     <?cs set:cur_row = #0 ?>
     <?cs each:cl = letter ?>
         <tr class="<?cs if:count % #2 ?>alt-color<?cs /if ?> api apilevel-<?cs var:cl.since ?>" >
@@ -36,9 +43,11 @@
 </table>
 <?cs /each ?>
 
-<?cs if:!devsite ?>
 <?cs include:"footer.cs" ?>
+</div><!-- end jd-content -->
+</div><!-- end doc-content -->
+
 <?cs include:"trailer.cs" ?>
-<?cs /if ?>
+
 </body>
-</html>
+</html>

tools/droiddoc/templates-sdk-dev/components/masthead.cs

@@ -1,295 +1,375 @@
 <?cs def:custom_masthead() ?>
-  <a name="top"></a>
+<?cs if:preview ?>
+  <?cs call:preview_masthead() ?>
+<?cs else ?>
+<a name="top"></a>
+
+<!-- dialog to prompt lang pref change when loaded from hardcoded URL
+<div id="langMessage" style="display:none">
+  <div>
+    <div class="lang en">
+      <p>You requested a page in English, would you like to proceed with this language setting?</p>
+    </div>
+    <div class="lang es">
+      <p>You requested a page in Spanish (Español), would you like to proceed with this language setting?</p>
+    </div>
+    <div class="lang ja">
+      <p>You requested a page in Japanese (日本語), would you like to proceed with this language setting?</p>
+    </div>
+    <div class="lang ko">
+      <p>You requested a page in Korean (한국어), would you like to proceed with this language setting?</p>
+    </div>
+    <div class="lang ru">
+      <p>You requested a page in Russian (Русский), would you like to proceed with this language setting?</p>
+    </div>
+    <div class="lang zh-cn">
+      <p>You requested a page in Simplified Chinese (简体中文), would you like to proceed with this language setting?</p>
+    </div>
+    <div class="lang zh-tw">
+      <p>You requested a page in Traditional Chinese (繁體中文), would you like to proceed with this language setting?</p>
+    </div>
+    <a href="#" class="button yes" onclick="return false;">
+      <span class="lang en">Yes</span>
+      <span class="lang es">Sí</span>
+      <span class="lang ja">Yes</span>
+      <span class="lang ko">Yes</span>
+      <span class="lang ru">Yes</span>
+      <span class="lang zh-cn">是的</span>
+      <span class="lang zh-tw">没有</span>
+    </a>
+    <a href="#" class="button" onclick="$('#langMessage').hide();return false;">
+      <span class="lang en">No</span>
+      <span class="lang es">No</span>
+      <span class="lang ja">No</span>
+      <span class="lang ko">No</span>
+      <span class="lang ru">No</span>
+      <span class="lang zh-cn">没有</span>
+      <span class="lang zh-tw">没有</span>
+    </a>
+  </div>
+</div> -->
+
+<?cs if:!devsite ?><?cs # leave out the global header for devsite; it is in devsite template ?>
   <!-- Header -->
   <div id="header-wrapper">
-    <div class="dac-header <?cs if:ndk ?>dac-ndk<?cs /if ?>" id="header">
+    <div id="header"><?cs call:butter_bar() ?>
-      <div class="dac-header-inner">
+      <div class="wrap" id="header-wrap">
-        <a class="dac-nav-toggle" data-dac-toggle-nav href="javascript:;" title="Open navigation">
+        <div class="col-3 logo">
-          <span class="dac-nav-hamburger">
+          <a href="<?cs var:toroot ?>index.html">
-            <span class="dac-nav-hamburger-top"></span>
+            <img src="<?cs var:toroot ?>assets/images/dac_logo.png"
-            <span class="dac-nav-hamburger-mid"></span>
+                srcset="<?cs var:toroot ?>assets/images/dac_logo@2x.png 2x"
-            <span class="dac-nav-hamburger-bot"></span>
+                width="123" height="25" alt="Android Developers" />
-          </span>
+          </a>
-        </a>
+          <div class="btn-quicknav" id="btn-quicknav">
-        <?cs if:ndk ?><a class="dac-header-logo" style="width:144px;" href="<?cs var:toroot
+            <a href="#" class="arrow-inactive">Quicknav</a>
-        ?>ndk/index.html">
+            <a href="#" class="arrow-active">Quicknav</a>
-          <img class="dac-header-logo-image" src="<?cs var:toroot ?>assets/images/android_logo.png"
+          </div>
-              srcset="<?cs var:toroot ?>assets/images/android_logo@2x.png 2x"
+        </div>
-              width="32" height="36" alt="Android" /> NDK
+        <ul class="nav-x col-9">
-          </a><?cs else ?><a class="dac-header-logo" href="<?cs var:toroot ?>index.html">
+            <li class="design">
-          <img class="dac-header-logo-image" src="<?cs var:toroot ?>assets/images/android_logo.png"
+              <a href="<?cs var:toroot ?>design/index.html"
-              srcset="<?cs var:toroot ?>assets/images/android_logo@2x.png 2x"
+              zh-tw-lang="設計"
-              width="32" height="36" alt="Android" /> Developers
+              zh-cn-lang="设计"
-          </a><?cs /if ?>
+              ru-lang="Проектирование"
+              ko-lang="디자인"
+              ja-lang="設計"
+              es-lang="Diseñar"
+              >Design</a></li>
+            <li class="develop"><a href="<?cs var:toroot ?>develop/index.html"
+              zh-tw-lang="開發"
+              zh-cn-lang="开发"
+              ru-lang="Разработка"
+              ko-lang="개발"
+              ja-lang="開発"
+              es-lang="Desarrollar"
+              >Develop</a></li>
+            <li class="distribute last"><a href="<?cs var:toroot ?>distribute/<?cs
+              if:android.whichdoc == "offline" ?>googleplay/<?cs /if ?>index.html"
+              zh-tw-lang="發佈"
+              zh-cn-lang="分发"
+              ru-lang="Распространение"
+              ko-lang="배포"
+              ja-lang="配布"
+              es-lang="Distribuir"
+              >Distribute</a></li>
+        </ul>
 
-        <?cs if:ndk
-        ?><ul class="dac-header-tabs">
-          <li>
-            <a href="<?cs var:toroot ?>ndk/guides/index.html" class="dac-header-tab"
-            zh-tw-lang="API 指南"
-            zh-cn-lang="API 指南"
-            ru-lang="Руководства по API"
-            ko-lang="API 가이드"
-            ja-lang="API ガイド"
-            es-lang="Guías de la API">Guides</a>
-          </li>
-          <li>
-            <a href="<?cs var:toroot ?>ndk/reference/index.html" class="dac-header-tab"
-            zh-tw-lang="參考資源"
-            zh-cn-lang="参考"
-            ru-lang="Справочник"
-            ko-lang="참조문서"
-            ja-lang="リファレンス"
-            es-lang="Referencia">Reference</a>
-          </li>
-          <li>
-            <a href="<?cs var:toroot ?>ndk/samples/index.html" class="dac-header-tab"
-           >Samples</a>
-          </li>
-          <li>
-            <a href="<?cs var:toroot ?>ndk/downloads/index.html" class="dac-header-tab"
-            >Downloads</a>
-          </li>
-        </ul><?cs else
-        ?><ul class="dac-header-tabs">
-          <li>
-          <a class="dac-header-tab" href="<?cs var:toroot ?>design/index.html"
-             zh-tw-lang="設計"
-             zh-cn-lang="设计"
-             ru-lang="Проектирование"
-             ko-lang="디자인"
-             ja-lang="設計"
-             es-lang="Diseñar">Design</a>
-          </li>
-          <li>
-          <a class="dac-header-tab" href="<?cs var:toroot ?>develop/index.html"
-             zh-tw-lang="開發"
-             zh-cn-lang="开发"
-             ru-lang="Разработка"
-             ko-lang="개발"
-             ja-lang="開発"
-             es-lang="Desarrollar">Develop</a>
-          </li>
-          <li>
-          <a class="dac-header-tab" href="<?cs var:toroot ?>distribute/index.html"
-             zh-tw-lang="發佈"
-             zh-cn-lang="分发"
-             ru-lang="Распространение"
-             ko-lang="배포"
-             ja-lang="配布"
-             es-lang="Distribuir">Distribute</a>
-          </li>
-        </ul><?cs
-        /if ?>
-
-        <?cs if:ndk ?><a class="dac-header-console-btn" href="http://developer.android.com">
-          Back to Android Developers
-        </a><?cs else ?><a class="dac-header-console-btn" href="https://play.google.com/apps/publish/">
-          <span class="dac-sprite dac-google-play"></span>
-          <span class="dac-visible-desktop-inline">Developer</span>
-          Console
-        </a><?cs /if ?>
 
         <?cs # ADD SEARCH AND MENU ?>
-        <?cs if:!ndk ?>
         <?cs call:header_search_widget() ?>
-        <?cs /if ?>
+
+
+        <!-- Expanded quicknav -->
+        <div id="quicknav" class="col-13">
+          <ul>
+            <li class="about">
+              <ul>
+                <li><a href="<?cs var:toroot ?>about/index.html">About</a></li>
+                <li><a href="<?cs var:toroot ?>wear/index.html">Wear</a></li>
+                <li><a href="<?cs var:toroot ?>tv/index.html">TV</a></li>
+                <li><a href="<?cs var:toroot ?>auto/index.html">Auto</a></li>
+              </ul>
+            </li>
+            <li class="design">
+              <ul>
+                <li><a href="<?cs var:toroot ?>design/index.html">Get Started</a></li>
+                <li><a href="<?cs var:toroot ?>design/devices.html">Devices</a></li>
+                <li><a href="<?cs var:toroot ?>design/style/index.html">Style</a></li>
+                <li><a href="<?cs var:toroot ?>design/patterns/index.html">Patterns</a></li>
+                <li><a href="<?cs var:toroot ?>design/building-blocks/index.html">Building Blocks</a></li>
+                <li><a href="<?cs var:toroot ?>design/downloads/index.html">Downloads</a></li>
+                <li><a href="<?cs var:toroot ?>design/videos/index.html">Videos</a></li>
+              </ul>
+            </li>
+            <li class="develop">
+              <ul>
+                <li><a href="<?cs var:toroot ?>training/index.html"
+                  zh-tw-lang="訓練課程"
+                  zh-cn-lang="培训"
+                  ru-lang="Курсы"
+                  ko-lang="교육"
+                  ja-lang="トレーニング"
+                  es-lang="Capacitación"
+                  >Training</a></li>
+                <li><a href="<?cs var:toroot ?>guide/index.html"
+                  zh-tw-lang="API 指南"
+                  zh-cn-lang="API 指南"
+                  ru-lang="Руководства по API"
+                  ko-lang="API 가이드"
+                  ja-lang="API ガイド"
+                  es-lang="Guías de la API"
+                  >API Guides</a></li>
+                <li><a href="<?cs var:toroot ?>reference/packages.html"
+                  zh-tw-lang="參考資源"
+                  zh-cn-lang="参考"
+                  ru-lang="Справочник"
+                  ko-lang="참조문서"
+                  ja-lang="リファレンス"
+                  es-lang="Referencia"
+                  >Reference</a></li>
+                <li><a href="<?cs var:toroot ?>sdk/index.html"
+                  zh-tw-lang="相關工具"
+                  zh-cn-lang="工具"
+                  ru-lang="Инструменты"
+                  ko-lang="도구"
+                  ja-lang="ツール"
+                  es-lang="Herramientas"
+                  >Tools</a>
+                </li>
+                <li><a href="<?cs var:toroot ?>google/index.html">Google Services</a>
+                </li>
+                <?cs if:android.hasSamples ?>
+                  <li><a href="<?cs var:toroot ?>samples/index.html">Samples</a>
+                  </li>
+                <?cs /if ?>
+              </ul>
+            </li>
+            <li class="distribute last">
+              <ul>
+                <li><a href="<?cs var:toroot ?>distribute/googleplay/index.html">Google Play</a></li>
+                <li><a href="<?cs var:toroot ?>distribute/essentials/index.html">Essentials</a></li>
+                <li><a href="<?cs var:toroot ?>distribute/users/index.html">Get Users</a></li>
+                <li><a href="<?cs var:toroot ?>distribute/engage/index.html">Engage &amp; Retain</a></li>
+                <li><a href="<?cs var:toroot ?>distribute/monetize/index.html">Monetize</a></li>
+                <li><a href="<?cs var:toroot ?>distribute/analyze/index.html">Analyze</a></li>
+                <li><a href="<?cs var:toroot ?>distribute/tools/index.html">Tools &amp; Reference</a></li>
+                <li><a href="<?cs var:toroot ?>distribute/stories/index.html">Developer Stories</a></li>
+              </ul>
+            </li>
+          </ul>
+        </div><!-- /Expanded quicknav -->
       </div><!-- end header-wrap.wrap -->
     </div><!-- end header -->
-  </div> <!--end header-wrapper -->
 
-  <?cs if:ndk ?>
+  <?cs if:about || wear || tv || auto ?>
-  <!-- NDK Navigation-->
+    <!-- Secondary x-nav -->
-  <nav class="dac-nav">
+    <div id="nav-x">
-    <div class="dac-nav-dimmer" data-dac-toggle-nav></div>
+        <div class="wrap">
-
+            <ul class="nav-x col-9 about" style="width:100%">
-    <div class="dac-nav-sidebar" data-swap data-dynamic="false" data-transition-speed="300" data-dac-nav>
+                <li class="about"><a href="<?cs var:toroot ?>about/index.html"
-                   <div data-swap-container>
+                  >About</a></li>
-        <?cs call:custom_left_nav() ?>
+                <li class="wear"><a href="<?cs var:toroot ?>wear/index.html"
-      <ul id="dac-main-navigation" class="dac-nav-list dac-swap-section dac-left dac-no-anim">
+                  >Wear</a></li>
-      <li class="dac-nav-item guides">
+                <li class="tv"><a href="<?cs var:toroot ?>tv/index.html"
-        <a class="dac-nav-link" href="<?cs var:toroot ?>ndk/guides/index.html"
+                  >TV</a></li>
-           zh-tw-lang="API 指南"
+                <li class="auto"><a href="<?cs var:toroot ?>auto/index.html"
-           zh-cn-lang="API 指南"
+                  >Auto</a></li>
-           ru-lang="Руководства по API"
+            </ul>
-           ko-lang="API 가이드"
+        </div>
-           ja-lang="API ガイド"
-           es-lang="Guías de la API">Guides</a>
-      </li>
-      <li class="dac-nav-item reference">
-        <a class="dac-nav-link" href="<?cs var:toroot ?>ndk/reference/index.html"
-           zh-tw-lang="參考資源"
-           zh-cn-lang="参考"
-           ru-lang="Справочник"
-           ko-lang="참조문서"
-           ja-lang="リファレンス"
-           es-lang="Referencia">Reference</a>
-      </li>
-      <li class="dac-nav-item samples">
-        <a class="dac-nav-link" href="<?cs var:toroot ?>ndk/samples/index.html"
-           >Samples</a>
-      </li>
-      <li class="dac-nav-item downloads">
-        <a class="dac-nav-link" href="<?cs var:toroot ?>ndk/downloads/index.html"
-           >Downloads</a>
-      </li>
-      </ul>
     </div>
-                       </div>
+    <!-- /Sendondary x-nav ABOUT -->
-  </nav>
-  <!-- end NDK navigation-->
 
 
 
-  <?cs else ?>
+  <?cs elif:training || guide || reference || tools || develop || google || samples ?>
-  <!-- Navigation-->
+    <!-- Secondary x-nav -->
-  <nav class="dac-nav">
+    <div id="nav-x">
-    <div class="dac-nav-dimmer" data-dac-toggle-nav></div>
+        <div class="wrap" style="position:relative;z-index:1">
 
-    <div class="dac-nav-sidebar" data-swap data-dynamic="false" data-transition-speed="300" data-dac-nav>
+        <?cs if:reference ?>
-      <div data-swap-container>
+
-        <?cs call:custom_left_nav() ?>
+        <?cs /if ?>
-        <ul id="dac-main-navigation" class="dac-nav-list dac-swap-section dac-left dac-no-anim">
+
-        <li class="dac-nav-item home">
+            <ul class="nav-x col-9 develop" style="width:100%">
-          <a class="dac-nav-link" href="<?cs var:toroot ?>index.html">Home</a>
+                <li class="training"><a href="<?cs var:toroot ?>training/index.html"
-          <i class="dac-sprite dac-expand-more-black dac-nav-sub-slider"></i>
+                  zh-tw-lang="訓練課程"
-          <ul class="dac-nav-secondary about">
+                  zh-cn-lang="培训"
-            <li class="dac-nav-item versions">
+                  ru-lang="Курсы"
-              <a class="dac-nav-link" href="<?cs var:toroot ?>about/versions/marshmallow/index.html">Android</a>
+                  ko-lang="교육"
-            </li>
+                  ja-lang="トレーニング"
-            <li class="dac-nav-item wear">
+                  es-lang="Capacitación"
-              <a class="dac-nav-link" href="<?cs var:toroot ?>wear/index.html">Wear</a>
+                  >Training</a></li>
-            </li>
+                <li class="guide"><a href="<?cs var:toroot ?>guide/index.html"
-            <li class="dac-nav-item tv">
+                  zh-tw-lang="API 指南"
-              <a class="dac-nav-link" href="<?cs var:toroot ?>tv/index.html">TV</a>
+                  zh-cn-lang="API 指南"
-            </li>
+                  ru-lang="Руководства по API"
-            <li class="dac-nav-item auto">
+                  ko-lang="API 가이드"
-              <a class="dac-nav-link" href="<?cs var:toroot ?>auto/index.html">Auto</a>
+                  ja-lang="API ガイド"
-            </li>
+                  es-lang="Guías de la API"
-          </ul>
+                  >API Guides</a></li>
-        </li>
+                <li class="reference"><a href="<?cs var:toroot ?>reference/packages.html"
-        <li class="dac-nav-item design">
+                  zh-tw-lang="參考資源"
-          <a class="dac-nav-link" href="<?cs var:toroot ?>design/index.html"
+                  zh-cn-lang="参考"
-             zh-tw-lang="設計"
+                  ru-lang="Справочник"
-             zh-cn-lang="设计"
+                  ko-lang="참조문서"
-             ru-lang="Проектирование"
+                  ja-lang="リファレンス"
-             ko-lang="디자인"
+                  es-lang="Referencia"
-             ja-lang="設計"
+                  >Reference</a></li>
-             es-lang="Diseñar">Design</a>
+                <li class="tools"><a href="<?cs var:toroot ?>sdk/index.html"
-        </li>
+                  zh-tw-lang="相關工具"
-        <li class="dac-nav-item develop">
+                  zh-cn-lang="工具"
-          <a class="dac-nav-link" href="<?cs var:toroot ?>develop/index.html"
+                  ru-lang="Инструменты"
-             zh-tw-lang="開發"
+                  ko-lang="도구"
-             zh-cn-lang="开发"
+                  ja-lang="ツール"
-             ru-lang="Разработка"
+                  es-lang="Herramientas"
-             ko-lang="개발"
+                  >Tools</a></li>
-             ja-lang="開発"
+                <li class="google"><a href="<?cs var:toroot ?>google/index.html"
-             es-lang="Desarrollar">Develop</a>
+                  >Google Services</a>
-          <i class="dac-sprite dac-expand-more-black dac-nav-sub-slider"></i>
+                </li>
-          <ul class="dac-nav-secondary develop">
+                <?cs if:android.hasSamples ?>
-            <li class="dac-nav-item training">
+                  <li class="samples"><a href="<?cs var:toroot ?>samples/index.html"
-              <a class="dac-nav-link" href="<?cs var:toroot ?>training/index.html"
+                    >Samples</a>
-                 zh-tw-lang="訓練課程"
+                  </li>
-                 zh-cn-lang="培训"
+                <?cs /if ?>
-                 ru-lang="Курсы"
+            </ul>
-                 ko-lang="교육"
+        </div>
-                 ja-lang="トレーニング"
-                 es-lang="Capacitación">Training</a>
-            </li>
-            <li class="dac-nav-item guide">
-              <a class="dac-nav-link" href="<?cs var:toroot ?>guide/index.html"
-                 zh-tw-lang="API 指南"
-                 zh-cn-lang="API 指南"
-                 ru-lang="Руководства по API"
-                 ko-lang="API 가이드"
-                 ja-lang="API ガイド"
-                 es-lang="Guías de la API">API Guides</a>
-            </li>
-            <li class="dac-nav-item reference">
-              <a class="dac-nav-link" href="<?cs var:toroot ?>reference/packages.html"
-                 zh-tw-lang="參考資源"
-                 zh-cn-lang="参考"
-                 ru-lang="Справочник"
-                 ko-lang="참조문서"
-                 ja-lang="リファレンス"
-                 es-lang="Referencia">Reference</a>
-            </li>
-            <li class="dac-nav-item tools">
-              <a class="dac-nav-link" href="<?cs var:toroot ?>sdk/index.html"
-                 zh-tw-lang="相關工具"
-                 zh-cn-lang="工具"
-                 ru-lang="Инструменты"
-                 ko-lang="도구"
-                 ja-lang="ツール"
-                 es-lang="Herramientas">Tools</a></li>
-            <li class="dac-nav-item google">
-              <a class="dac-nav-link" href="<?cs var:toroot ?>google/index.html">Google Services</a>
-            </li>
-            <?cs if:android.hasSamples ?>
-            <li class="dac-nav-item samples">
-              <a class="dac-nav-link" href="<?cs var:toroot ?>samples/index.html">Samples</a>
-            </li>
-            <?cs /if ?>
-          </ul>
-        </li>
-        <li class="dac-nav-item distribute">
-          <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/<?cs if:android.whichdoc == 'offline' ?>googleplay/<?cs /if ?>index.html"
-             zh-tw-lang="發佈"
-             zh-cn-lang="分发"
-             ru-lang="Распространение"
-             ko-lang="배포"
-             ja-lang="配布"
-             es-lang="Distribuir">Distribute</a>
-          <i class="dac-sprite dac-expand-more-black dac-nav-sub-slider"></i>
-          <ul class="dac-nav-secondary distribute">
-            <li class="dac-nav-item googleplay">
-              <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/googleplay/index.html">Google Play</a></li>
-            <li class="dac-nav-item essentials">
-              <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/essentials/index.html">Essentials</a></li>
-            <li class="dac-nav-item users">
-              <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/users/index.html">Get Users</a></li>
-            <li class="dac-nav-item engage">
-              <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/engage/index.html">Engage &amp; Retain</a></li>
-            <li class="dac-nav-item monetize">
-              <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/monetize/index.html">Earn</a>
-            </li>
-            <li class="dac-nav-item analyze">
-              <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/analyze/index.html">Analyze</a>
-            </li>
-            <li class="dac-nav-item stories">
-              <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/stories/index.html">Stories</a>
-            </li>
-          </ul>
-        </li>
-        <li class="dac-nav-item preview">
-          <a class="dac-nav-link" href="<?cs var:toroot ?>preview/index.html">Preview</a>
-        </li>
-        </ul>
-      </div>
     </div>
-  </nav>
+    <!-- /Sendondary x-nav DEVELOP -->
-  <!-- end navigation-->
+
+  <?cs elif:distribute || googleplay || essentials || users || engage || monetize || analyze ||  disttools || stories ?>
+    <!-- Secondary distribute x-nav -->
+    <div id="nav-x">
+        <div class="wrap">
+            <ul class="nav-x distribute">
+                <li class="googleplay"><a href="<?cs var:toroot ?>distribute/googleplay/index.html"
+                  >Google Play</a></li>
+                <li class="essentials"><a href="<?cs var:toroot ?>distribute/essentials/index.html"
+                  >Essentials</a></li>
+                <li class="users"><a href="<?cs var:toroot ?>distribute/users/index.html"
+                  >Get Users</a></li>
+                <li class="engage"><a href="<?cs var:toroot ?>distribute/engage/index.html"
+                  >Engage &amp; Retain</a></li>
+                <li class="monetize"><a href="<?cs var:toroot ?>distribute/monetize/index.html"
+                  >Monetize</a>
+                </li>
+                <li class="analyze"><a href="<?cs var:toroot ?>distribute/analyze/index.html"
+                  >Analyze</a>
+                </li>
+                <li class="disttools"><a href="<?cs var:toroot ?>distribute/tools/index.html"
+                  >Tools</a>
+                </li>
+                <li class="stories"><a href="<?cs var:toroot ?>distribute/stories/index.html"
+                  >Stories</a>
+                </li>
+            </ul>
+            <a href="https://play.google.com/apps/publish/" class="developer-console-btn">Developer Console</a>
+        </div> <!-- /Secondary distribute x-nav -->
+    </div>
+    <!-- /Sendondary x-nav DISTRIBUTE -->
   <?cs /if ?>
 
-<!-- Nav Setup -->
+    <div id="searchResults" class="wrap" style="display:none;">
-<script>$('[data-dac-nav]').dacNav();</script>
+      <h2 id="searchTitle">Results</h2>
+      <div id="leftSearchControl" class="search-control">Loading...</div>
+    </div>
+  </div> <!--end header-wrapper -->
 
-<?cs
+  <div id="sticky-header">
-/def ?><?cs # end custom_masthead() ?>
+    <div>
-
+      <a class="logo" href="#top"></a>
-
+      <a class="top" href="#top"></a>
-<?cs def:toast() ?>
+      <ul class="breadcrumb">
-
+        <?cs # More <li> elements added here with javascript ?>
-  <?cs # (UN)COMMENT TO TOGGLE VISIBILITY
+        <?cs if:!section.landing ?><li class="current"><?cs var:page.title ?></li><?cs
-
+        /if ?>
-  <div class="dac-toast-group">
+      </ul>
-    <div class="dac-toast" data-toast>
-      <div class="dac-toast-wrap">
-        This is a demo notification <a href="#">Learn more</a>.
-      </div>
     </div>
   </div>
 
+<?cs /if ?><?cs # end if/else !devsite ?>
+<?cs /if ?><?cs # end if/else preview ?><?cs
+/def ?>
+
+<?cs def:preview_masthead() ?>
+<a name="top"></a>
+
+
+<!-- Header -->
+<div id="header-wrapper">
+  <div id="header"><?cs call:butter_bar() ?>
+    <div class="wrap" id="header-wrap">
+      <div class="col_3 logo landing-logo" style="width:240px">
+        <a href="<?cs var:toroot ?>preview/index.html">
+          <img src="<?cs var:toroot ?>assets/images/android.png" height="25" alt="Android"
+            style="margin:-3px 0 0" />
+        </a>
+      </div>
+      <div class="col-8" style="margin:0"><h1 style="margin: 4px 0 0 0px;padding:0;line-height:16px;
+color:#666;font-weight:100;font-size:27px;">M Developer Preview</h1></div>
+
+      <?cs # ADD SEARCH AND MENU ?>
+      <?cs call:header_search_widget() ?>
+
+    </div><!-- end header-wrap -->
+  </div><!-- /Header -->
+
+
+  <div id="searchResults" class="wrap" style="display:none;">
+          <h2 id="searchTitle">Results</h2>
+          <div id="leftSearchControl" class="search-control">Loading...</div>
+  </div>
+</div> <!--end header-wrapper -->
+
+<div id="sticky-header">
+  <div>
+    <a class="logo" href="#top"></a>
+    <a class="top" href="#top"></a>
+    <ul class="breadcrumb">
+      <?cs # More <li> elements added here with javascript ?>
+      <?cs if:!section.landing ?><li class="current"><?cs var:page.title ?></li><?cs
+      /if ?>
+    </ul>
+  </div>
+</div>
+
+  <?cs
+/def ?>
+
+
+<?cs # (UN)COMMENT THE INSIDE OF THIS METHOD TO TOGGLE VISIBILITY ?>
+<?cs def:butter_bar() ?>
+
+<?cs # HIDE THE BUTTER BAR
+
+    <div style="height:20px"><!-- spacer to bump header down --></div>
+    <div id="butterbar-wrapper">
+      <div id="butterbar">
+        <a href="http://googleblog.blogspot.com/" id="butterbar-message">
+          The Android {version_number} SDK will be available on {Month} {Day}!
+        </a>
+      </div>
+    </div>
+
 ?>
 
 <?cs /def ?>

tools/droiddoc/templates-sdk-dev/customizations.cs

@@ -1,33 +1,337 @@
-<?cs def:body_content_wrap_start() ?>
+<?cs 
-  <div class="wrap clearfix" id="body-content">
+def:fullpage() ?>
-<?cs /def ?>
-
-<?cs def:fullpage() ?>
   <div id="body-content">
-    <div>
+<?cs /def ?>
+<?cs 
+def:sdk_nav() ?>
+  <div class="wrap clearfix" id="body-content">
+    <div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
+      <div id="devdoc-nav" class="scroll-pane">
+
+<?cs 
+        include:"../../../../frameworks/base/docs/html/sdk/sdk_toc.cs" ?>
+
+
+      </div>
+    </div> <!-- end side-nav -->
+<?cs /def ?><?cs
+
+def:no_nav() ?>
+  <div class="wrap clearfix" id="body-content">
+<?cs /def ?><?cs
+
+def:tools_nav() ?>
+  <div class="wrap clearfix" id="body-content">
+    <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
+      <div id="devdoc-nav" class="scroll-pane">
+<?cs 
+        include:"../../../../frameworks/base/docs/html/tools/tools_toc.cs" ?>
+        
+        
+      </div>
+    </div> <!-- end side-nav -->
+    <script>
+      $(document).ready(function() {
+        scrollIntoView("devdoc-nav");
+        });
+    </script>
+<?cs /def ?>
+<?cs
+def:training_nav() ?>
+  <div class="wrap clearfix" id="body-content">
+    <div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
+      <div id="devdoc-nav" class="scroll-pane">
+
+
+<?cs 
+        include:"../../../../frameworks/base/docs/html/training/training_toc.cs" ?>
+        
+
+      </div>
+    </div> <!-- end side-nav -->
+    <script>
+      $(document).ready(function() {
+        scrollIntoView("devdoc-nav");
+        });
+    </script>
+<?cs /def ?><?cs
+
+def:googleplay_nav() ?>
+  <div class="wrap clearfix" id="body-content">
+    <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
+      <div id="devdoc-nav" class="scroll-pane">
+<?cs include:"../../../../frameworks/base/docs/html/distribute/googleplay/googleplay_toc.cs" ?>
+      </div>
+    </div> <!-- end side-nav -->
+    <script>
+      $(document).ready(function() {
+        scrollIntoView("devdoc-nav");
+        });
+    </script>
+<?cs /def ?><?cs
+
+def:essentials_nav() ?>
+  <div class="wrap clearfix" id="body-content">
+    <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
+      <div id="devdoc-nav" class="scroll-pane">
+<?cs include:"../../../../frameworks/base/docs/html/distribute/essentials/essentials_toc.cs" ?>
+      </div>
+    </div> <!-- end side-nav -->
+    <script>
+      $(document).ready(function() {
+        scrollIntoView("devdoc-nav");
+        });
+    </script>
+<?cs /def ?><?cs
+
+def:users_nav() ?>
+  <div class="wrap clearfix" id="body-content">
+    <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
+      <div id="devdoc-nav" class="scroll-pane">
+<?cs include:"../../../../frameworks/base/docs/html/distribute/users/users_toc.cs" ?>
+      </div>
+    </div> <!-- end side-nav -->
+    <script>
+      $(document).ready(function() {
+        scrollIntoView("devdoc-nav");
+        });
+    </script>
+<?cs /def ?><?cs
+
+def:engage_nav() ?>
+  <div class="wrap clearfix" id="body-content">
+    <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
+      <div id="devdoc-nav" class="scroll-pane">
+<?cs include:"../../../../frameworks/base/docs/html/distribute/engage/engage_toc.cs" ?>
+      </div>
+    </div> <!-- end side-nav -->
+    <script>
+      $(document).ready(function() {
+        scrollIntoView("devdoc-nav");
+        });
+    </script>
+<?cs /def ?><?cs
+
+def:analyze_nav() ?>
+  <div class="wrap clearfix" id="body-content">
+    <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
+      <div id="devdoc-nav" class="scroll-pane">
+<?cs include:"../../../../frameworks/base/docs/html/distribute/analyze/analyze_toc.cs" ?>
+      </div>
+    </div> <!-- end side-nav -->
+    <script>
+      $(document).ready(function() {
+        scrollIntoView("devdoc-nav");
+        });
+    </script>
+<?cs /def ?><?cs
+
+def:monetize_nav() ?>
+  <div class="wrap clearfix" id="body-content">
+    <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
+      <div id="devdoc-nav" class="scroll-pane">
+<?cs include:"../../../../frameworks/base/docs/html/distribute/monetize/monetize_toc.cs" ?>
+      </div>
+    </div> <!-- end side-nav -->
+    <script>
+      $(document).ready(function() {
+        scrollIntoView("devdoc-nav");
+        });
+    </script>
+<?cs /def ?><?cs
+
+def:disttools_nav() ?>
+  <div class="wrap clearfix" id="body-content">
+    <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
+      <div id="devdoc-nav" class="scroll-pane">
+<?cs include:"../../../../frameworks/base/docs/html/distribute/tools/disttools_toc.cs" ?>
+      </div>
+    </div> <!-- end side-nav -->
+    <script>
+      $(document).ready(function() {
+        scrollIntoView("devdoc-nav");
+        });
+    </script>
+<?cs /def ?><?cs
+
+def:stories_nav() ?>
+  <div class="wrap clearfix" id="body-content">
+    <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
+      <div id="devdoc-nav" class="scroll-pane">
+<?cs include:"../../../../frameworks/base/docs/html/distribute/stories/stories_toc.cs" ?>
+      </div>
+    </div> <!-- end side-nav -->
+    <script>
+      $(document).ready(function() {
+        scrollIntoView("devdoc-nav");
+        });
+    </script>
+<?cs /def ?><?cs
+
+def:guide_nav() ?>
+  <div class="wrap clearfix" id="body-content">
+    <div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
+      <div id="devdoc-nav" class="scroll-pane">
+
+<?cs 
+        include:"../../../../frameworks/base/docs/html/guide/guide_toc.cs" ?>
+        
+
+      </div>
+    </div> <!-- end side-nav -->
+    <script>
+      $(document).ready(function() {
+        scrollIntoView("devdoc-nav");
+        });
+    </script>
+<?cs /def ?>
+<?cs
+def:design_nav() ?>
+  <div class="wrap clearfix" id="body-content">
+    <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
+      <div id="devdoc-nav" class="scroll-pane">
+
+
+<?cs
+        include:"../../../../frameworks/base/docs/html/design/design_toc.cs" ?>
+       
+
+      </div>
+    </div> <!-- end side-nav -->
+    <script>
+      $(document).ready(function() {
+        scrollIntoView("devdoc-nav");
+        });
+    </script>
+<?cs /def ?>
+<?cs
+def:distribute_nav() ?>
+  <div class="wrap clearfix" id="body-content">
+    <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
+      <div id="devdoc-nav" class="scroll-pane">
+
+<?cs
+        include:"../../../../frameworks/base/docs/html/distribute/distribute_toc.cs" ?>
+        
+
+      </div>
+    </div> <!-- end side-nav -->
+    <script>
+      $(document).ready(function() {
+        scrollIntoView("devdoc-nav");
+        });
+    </script>
 <?cs /def ?>
 
-<?cs # The default side navigation for the reference docs ?>
+<?cs
-<?cs def:reference_default_nav() ?>
+def:samples_nav() ?>
-  <!-- Fullscreen toggler -->
+  <div class="wrap clearfix" id="body-content">
-  <button data-fullscreen class="dac-nav-fullscreen">
+    <div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
-    <i class="dac-sprite dac-fullscreen"></i>
+      <div id="devdoc-nav" class="scroll-pane">
-  </button>
 
-  <script>$('[data-fullscreen]').dacFullscreen();</script>
+<?cs
-  <!-- End: Fullscreen toggler -->
+        include:"../../../../frameworks/base/docs/html/samples/samples_toc.cs" ?>
 
-  <?cs if:reference.gcm || reference.gms ?>
+      </div>
-    <?cs include:"../../../../frameworks/base/docs/html/google/google_toc.cs" ?>
+
-    <script type="text/javascript">
+    </div> <!-- end side-nav -->
-      showGoogleRefTree();
+    <script>
+      $(document).ready(function() {
+        scrollIntoView("devdoc-nav");
+        });
     </script>
-  <?cs else ?>
+<?cs /def ?>
-    <div id="devdoc-nav">
+
+<?cs
+def:google_nav() ?>
+  <div class="wrap clearfix" id="body-content">
+    <div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
+      <div id="devdoc-nav" class="scroll-pane">
+
+<?cs
+        include:"../../../../frameworks/base/docs/html/google/google_toc.cs" ?>
+        
+
+      </div>
+      <script type="text/javascript">
+       showGoogleRefTree();
+    
+      </script>
+    </div> <!-- end side-nav -->
+    <script>
+      $(document).ready(function() {
+        scrollIntoView("devdoc-nav");
+        });
+    </script>
+<?cs /def ?>
+
+<?cs
+def:about_nav() ?>
+  <div class="wrap clearfix" id="body-content">
+    <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
+      <div id="devdoc-nav" class="scroll-pane">
+
+<?cs
+        include:"../../../../frameworks/base/docs/html/about/about_toc.cs" ?>
+        
+
+      </div>
+    </div> <!-- end side-nav -->
+    <script>
+      $(document).ready(function() {
+        scrollIntoView("devdoc-nav");
+        });
+    </script>
+<?cs /def ?>
+
+
+<?cs
+def:wear_nav() ?>
+  <div class="wrap clearfix" id="body-content">
+    <div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
+      <div id="devdoc-nav" class="scroll-pane">
+
+<?cs
+        include:"../../../../frameworks/base/docs/html/wear/wear_toc.cs" ?>
+
+
+      </div>
+    </div> <!-- end side-nav -->
+    <script>
+      $(document).ready(function() {
+        scrollIntoView("devdoc-nav");
+        });
+    </script>
+<?cs /def ?>
+
+<?cs
+def:preview_nav() ?>
+  <div class="wrap clearfix" id="body-content">
+    <div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
+      <div id="devdoc-nav" class="scroll-pane">
+        <?cs
+          include:"../../../../frameworks/base/docs/html/preview/preview_toc.cs" ?>
+      </div>
+    </div> <!-- end side-nav -->
+    <script>
+      $(document).ready(function() {
+        scrollIntoView("devdoc-nav");
+        });
+    </script>
+<?cs /def ?>
+
+<?cs # The default side navigation for the reference docs ?><?cs 
+def:default_left_nav() ?>
+<?cs if:reference.gcm || reference.gms ?>
+  <?cs call:google_nav() ?>
+<?cs else ?>
+  <div class="wrap clearfix" id="body-content">
+    <div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
+      <div id="devdoc-nav">
       <div id="api-nav-header">
         <div id="api-level-toggle">
           <label for="apiLevelCheckbox" class="disabled"
-                 title="Select your target API level to dim unavailable APIs">API level: </label>
+            title="Select your target API level to dim unavailable APIs">API level: </label>
           <div class="select-wrapper">
             <select id="apiLevelSelector">
               <!-- option elements added by buildApiLevelSelector() -->
@@ -35,209 +339,277 @@
           </div>
         </div><!-- end toggle -->
         <div id="api-nav-title">Android APIs</div>
-      </div><!-- end nav header -->
+        </div><!-- end nav header -->
       <script>
-        var SINCE_DATA = [ <?cs
+        var SINCE_DATA = [ <?cs 
-          each:since = since ?>'<?cs
+          each:since = since ?>'<?cs 
-            var:since.name ?>'<?cs
+            var:since.name ?>'<?cs 
             if:!last(since) ?>, <?cs /if ?><?cs
-            /each
+          /each 
-          ?> ];
+        ?> ];
         buildApiLevelSelector();
       </script>
+                  
+      <div id="swapper">
+        <div id="nav-panels">
+          <div id="resize-packages-nav">
+            <div id="packages-nav" class="scroll-pane">
 
-      <div class="dac-reference-nav" data-reference-tree>
+              <ul>
-        <ul class="dac-reference-nav-list" data-reference-namespaces>
+                <?cs call:package_link_list(docs.packages) ?>
-          <?cs call:package_link_list(docs.packages) ?>
+              </ul><br/>
-        </ul>
 
-        <?cs if:subcount(class.package) ?>
+            </div> <!-- end packages-nav -->
-        <ul data-reference-resources>
+          </div> <!-- end resize-packages -->
-          <?cs call:list("Annotations", class.package.annotations) ?>
+          <div id="classes-nav" class="scroll-pane">
-          <?cs call:list("Interfaces", class.package.interfaces) ?>
+
-          <?cs call:list("Classes", class.package.classes) ?>
+
-          <?cs call:list("Enums", class.package.enums) ?>
+<?cs 
-          <?cs call:list("Exceptions", class.package.exceptions) ?>
+            if:subcount(class.package) ?>
-          <?cs call:list("Errors", class.package.errors) ?>
+            <ul>
-        </ul>
+              <?cs call:list("Annotations", class.package.annotations) ?>
-        <?cs elif:subcount(package) ?>
+              <?cs call:list("Interfaces", class.package.interfaces) ?>
-        <ul data-reference-resources>
+              <?cs call:list("Classes", class.package.classes) ?>
-          <?cs call:class_link_list("Annotations", package.annotations) ?>
+              <?cs call:list("Enums", class.package.enums) ?>
-          <?cs call:class_link_list("Interfaces", package.interfaces) ?>
+              <?cs call:list("Exceptions", class.package.exceptions) ?>
-          <?cs call:class_link_list("Classes", package.classes) ?>
+              <?cs call:list("Errors", class.package.errors) ?>
-          <?cs call:class_link_list("Enums", package.enums) ?>
+            </ul><?cs 
-          <?cs call:class_link_list("Exceptions", package.exceptions) ?>
+            elif:subcount(package) ?>
-          <?cs call:class_link_list("Errors", package.errors) ?>
+            <ul>
-        </ul>
+              <?cs call:class_link_list("Annotations", package.annotations) ?>
-        <?cs /if ?>
+              <?cs call:class_link_list("Interfaces", package.interfaces) ?>
-      </div>
+              <?cs call:class_link_list("Classes", package.classes) ?>
-    </div>
+              <?cs call:class_link_list("Enums", package.enums) ?>
-  <?cs /if ?>
+              <?cs call:class_link_list("Exceptions", package.exceptions) ?>
-<?cs /def ?>
+              <?cs call:class_link_list("Errors", package.errors) ?>
-
+            </ul><?cs 
-<?cs
+            else ?>
-def:ndk_nav() ?>
+              <p style="padding:10px">Select a package to view its members</p><?cs 
-  <div class="wrap clearfix" id="body-content"><div class="cols">
+            /if ?><br/>
-    <div class="col-3 dac-toggle dac-mobile" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
+        
-      <?cs call:mobile_nav_toggle() ?>
+
-      <div class="dac-toggle-content" id="devdoc-nav">
+          </div><!-- end classes -->
-        <div class="scroll-pane">
+        </div><!-- end nav-panels -->
-<?cs
+        <div id="nav-tree" style="display:none" class="scroll-pane">
-if:guide ?><?cs include:"../../../../frameworks/base/docs/html/ndk/guides/guides_toc.cs" ?><?cs
+          <div id="tree-list"></div>
-elif:reference ?><?cs include:"../../../../frameworks/base/docs/html/ndk/reference/reference_toc.cs" ?><?cs
+        </div><!-- end nav-tree -->
-elif:downloads ?><?cs include:"../../../../frameworks/base/docs/html/ndk/downloads/downloads_toc.cs" ?><?cs
+      </div><!-- end swapper -->
-elif:samples ?><?cs include:"../../../../frameworks/base/docs/html/ndk/samples/samples_toc.cs" ?><?cs
+      <div id="nav-swap">
-/if ?>
+      <a class="fullscreen">fullscreen</a>
-        </div>
+      <a href='#' onclick='swapNav();return false;'><span id='tree-link'>Use Tree Navigation</span><span id='panel-link' style='display:none'>Use Panel Navigation</span></a>
       </div>
+    </div> <!-- end devdoc-nav -->
     </div> <!-- end side-nav -->
-<?cs /def ?>
+    <script type="text/javascript">
+      // init fullscreen based on user pref
+      var fullscreen = readCookie("fullscreen");
+      if (fullscreen != 0) {
+        if (fullscreen == "false") {
+          toggleFullscreen(false);
+        } else {
+          toggleFullscreen(true);
+        }
+      }
+      // init nav version for mobile
+      if (isMobile) {
+        swapNav(); // tree view should be used on mobile
+        $('#nav-swap').hide();
+      } else {
+        chooseDefaultNav();
+        if ($("#nav-tree").is(':visible')) {
+          init_default_navtree("<?cs var:toroot ?>");
+        }
+      }
+      // scroll the selected page into view
+      $(document).ready(function() {
+        scrollIntoView("packages-nav");
+        scrollIntoView("classes-nav");
+        });
+    </script>
+<?cs /if ?>
+    <?cs 
+/def ?>
 
-<?cs def:header_search_widget() ?>
-  <form data-search class="dac-header-search">
-    <button class="dac-header-search-close" data-search-close>
-      <i class="dac-sprite dac-back-arrow"></i>
-    </button>
 
-    <div class="dac-header-search-inner">
+<?cs
-      <i class="dac-sprite dac-search-white dac-header-search-icon"></i>
+def:header_search_widget() ?>
-      <input id="search_autocomplete" type="text" value="" autocomplete="off" name="q" class="dac-header-search-input" placeholder="Search" />
+<div class="menu-container">
-      <button class="dac-header-search-clear dac-hidden" data-search-clear>
+  <div class="moremenu">
-        <i class="dac-sprite dac-close-black"></i>
+    <div id="more-btn"></div>
-      </button>
+  </div>
-    </div>
+  <div class="morehover" id="moremenu">
-  </form>
+    <div class="top"></div>
-<?cs /def ?>
+    <div class="mid">
+      <div class="header">Links</div>
+      <ul>
+        <li><a href="https://play.google.com/apps/publish/" target="_googleplay">Google Play Developer Console</a></li>
+        <li><a href="http://android-developers.blogspot.com/">Android Developers Blog</a></li>
+        <li><a href="<?cs var:toroot ?>about/index.html">About Android</a></li>
+      </ul>
+      <div class="header">Android Sites</div>
+      <ul>
+        <li><a href="http://www.android.com">Android.com</a></li>
+        <li class="active"><a>Android Developers</a></li>
+        <li><a href="http://source.android.com">Android Open Source Project</a></li>
+      </ul>
 
-<?cs def:search_results() ?>
+      <?cs # Include language switcher only in online docs ?>
-  <div id="search-results" class="dac-search-results">
+      <?cs if:android.whichdoc == "online" ?>
-    <div id="dac-search-results-history" class="dac-search-results-history">
+        <div class="header">Language</div>
-      <div class="wrap dac-search-results-history-wrap">
+          <div id="language" class="locales">
-        <div class="cols">
+            <select name="language" onChange="changeLangPref(this.value, true)">
-          <div class="col-1of2 col-tablet-1of2 col-mobile-1of1">
+                <option value="en">English</option>
-            <h2>Most visited</h2>
+                <option value="es">Español</option>
-            <div class="resource-flow-layout" data-history-query="history:most/visited" data-maxresults="3" data-cardsizes="18x2"></div>
+                <option value="ja">日本語</option>
+                <option value="ko">한국어</option>
+                <option value="ru">Русский</option>
+                <option value="zh-cn">中文（简体)</option>
+                <option value="zh-tw">中文（繁體)</option>
+            </select>
           </div>
+        <script type="text/javascript">
+          <!--
+          loadLangPref();
+            //-->
+        </script>
+      <?cs /if ?>
+      <?cs # End of lang switcher ?>
+      <br class="clearfix" />
+    </div><!-- end 'mid' -->
+    <div class="bottom"></div>
+  </div><!-- end 'moremenu' -->
 
-          <div class="col-1of2 col-tablet-1of2 col-mobile-1of1">
+  <div class="search" id="search-container">
-            <h2>Recently visited</h2>
+    <div class="search-inner">
-            <div class="resource-flow-layout cols" data-history-query="history:recent" data-allow-duplicates="true" data-maxresults="3" data-cardsizes="18x2"></div>
+      <div id="search-btn"></div>
-          </div>
+      <div class="left"></div>
-        </div>
+      <form onsubmit="return submit_search()">
-      </div>
+        <input id="search_autocomplete" type="text" value="" autocomplete="off" name="q"
-    </div>
+          onfocus="search_focus_changed(this, true)" onblur="search_focus_changed(this, false)"
-
+          onkeydown="return search_changed(event, true, '<?cs var:toroot ?>')"
-    <div id="dac-search-results-content" class="dac-search-results-content">
+          onkeyup="return search_changed(event, false, '<?cs var:toroot ?>')" />
-      <div class="dac-search-results-metadata wrap">
+      </form>
-        <div class="dac-search-results-for">
+      <div class="right"></div>
-          <h2>Results for <span id="search-results-for"></span></h2>
+      <a class="close hide">close</a>
-        </div>
+      <div class="left"></div>
-
+      <div class="right"></div>
-        <div id="dac-search-results-hero"></div>
+    </div><!-- end search-inner -->
-
+  </div><!-- end search-container -->
-        <div class="dac-search-results-hero cols">
-          <div id="dac-search-results-reference" class="col-3of6 col-tablet-1of2 col-mobile-1of1">
-            <div class="suggest-card reference no-display">
-              <ul class="dac-search-results-reference">
-              </ul>
-            </div>
-          </div>
-          <div id="dac-custom-search-results"></div>
-        </div>
-      </div>
 
+  <div class="search_filtered_wrapper reference">
+    <div class="suggest-card reference no-display">
+      <ul class="search_filtered">
+      </ul>
     </div>
   </div>
-<?cs /def ?>
 
-<?cs def:custom_left_nav() ?>
+  <div class="search_filtered_wrapper docs">
-  <?cs if:(!fullpage && !nonavpage) || forcelocalnav ?>
+    <div class="suggest-card dummy no-display">&nbsp;</div>
-    <a class="dac-nav-back-button dac-swap-section dac-up dac-no-anim" data-swap-button href="javascript:;">
+    <div class="suggest-card develop no-display">
-      <i class="dac-sprite dac-nav-back"></i> <span class="dac-nav-back-title">Back</span>
+      <ul class="search_filtered">
-    </a>
+      </ul>
-    <div class="dac-nav-sub dac-swap-section dac-right dac-active" itemscope itemtype="http://schema.org/SiteNavigationElement">
+      <div class="child-card guides no-display">
-      <?cs if:ndk ?>
+      </div>
-        <?cs if:guide ?>
+      <div class="child-card training no-display">
-          <?cs include:"../../../../frameworks/base/docs/html/ndk/guides/guides_toc.cs" ?>
+      </div>
-        <?cs elif:reference ?>
+      <div class="child-card samples no-display">
-          <?cs include:"../../../../frameworks/base/docs/html/ndk/reference/reference_toc.cs" ?>
+      </div>
-        <?cs elif:downloads ?>
-          <?cs include:"../../../../frameworks/base/docs/html/ndk/downloads/downloads_toc.cs" ?>
-        <?cs elif:samples ?>
-          <?cs include:"../../../../frameworks/base/docs/html/ndk/samples/samples_toc.cs" ?>
-        <?cs else ?>
-          <?cs call:reference_default_nav() ?>
-        <?cs /if ?>
-      <?cs elif:guide ?>
-        <?cs include:"../../../../frameworks/base/docs/html/guide/guide_toc.cs" ?>
-      <?cs elif:design ?>
-        <?cs include:"../../../../frameworks/base/docs/html/design/design_toc.cs" ?>
-      <?cs elif:training ?>
-        <?cs include:"../../../../frameworks/base/docs/html/training/training_toc.cs" ?>
-      <?cs elif:tools ?>
-        <?cs include:"../../../../frameworks/base/docs/html/tools/tools_toc.cs" ?>
-      <?cs elif:google ?>
-        <?cs include:"../../../../frameworks/base/docs/html/google/google_toc.cs" ?>
-      <?cs elif:samples ?>
-        <?cs include:"../../../../frameworks/base/docs/html/samples/samples_toc.cs" ?>
-      <?cs elif:preview ?>
-        <?cs include:"../../../../frameworks/base/docs/html/preview/preview_toc.cs" ?>
-      <?cs elif:distribute ?>
-        <?cs if:googleplay ?>
-          <?cs include:"../../../../frameworks/base/docs/html/distribute/googleplay/googleplay_toc.cs" ?>
-        <?cs elif:essentials ?>
-          <?cs include:"../../../../frameworks/base/docs/html/distribute/essentials/essentials_toc.cs" ?>
-        <?cs elif:users ?>
-          <?cs include:"../../../../frameworks/base/docs/html/distribute/users/users_toc.cs" ?>
-        <?cs elif:engage ?>
-          <?cs include:"../../../../frameworks/base/docs/html/distribute/engage/engage_toc.cs" ?>
-        <?cs elif:monetize ?>
-          <?cs include:"../../../../frameworks/base/docs/html/distribute/monetize/monetize_toc.cs" ?>
-        <?cs elif:analyze ?>
-          <?cs include:"../../../../frameworks/base/docs/html/distribute/analyze/analyze_toc.cs" ?>
-        <?cs elif:disttools ?>
-          <?cs include:"../../../../frameworks/base/docs/html/distribute/tools/disttools_toc.cs" ?>
-        <?cs elif:stories ?>
-          <?cs include:"../../../../frameworks/base/docs/html/distribute/stories/stories_toc.cs" ?>
-        <?cs /if ?>
-      <?cs elif:about ?>
-        <?cs include:"../../../../frameworks/base/docs/html/about/about_toc.cs" ?>
-      <?cs else ?>
-        <?cs call:reference_default_nav() ?>
-      <?cs /if ?>
     </div>
-  <?cs /if ?>
+    <div class="suggest-card design no-display">
+      <ul class="search_filtered">
+      </ul>
+    </div>
+    <div class="suggest-card distribute no-display">
+      <ul class="search_filtered">
+      </ul>
+    </div>
+  </div>
+</div><!-- end menu-container (search and menu widget) -->
 <?cs /def ?>
 
-<?cs # appears at the bottom of every page ?>
+
-<?cs def:custom_cc_copyright() ?>
+
-  Except as noted, this content is
+<?cs 
+def:custom_left_nav() ?><?cs
+  if:fullpage ?><?cs
+    call:fullpage() ?><?cs
+  elif:nonavpage ?><?cs
+    call:no_nav() ?><?cs
+  elif:guide ?><?cs 
+    call:guide_nav() ?><?cs 
+  elif:design ?><?cs
+    call:design_nav() ?><?cs 
+  elif:training ?><?cs 
+    call:training_nav() ?><?cs 
+  elif:tools ?><?cs 
+    call:tools_nav() ?><?cs
+  elif:google ?><?cs 
+    call:google_nav() ?><?cs 
+  elif:samples ?><?cs
+    call:samples_nav() ?><?cs
+  elif:distribute ?><?cs 
+    if:googleplay ?><?cs
+      call:googleplay_nav() ?><?cs
+    elif:essentials ?><?cs
+      call:essentials_nav() ?><?cs
+    elif:users ?><?cs
+      call:users_nav() ?><?cs
+    elif:engage ?><?cs
+      call:engage_nav() ?><?cs
+    elif:monetize ?><?cs
+      call:monetize_nav() ?><?cs
+    elif:analyze ?><?cs
+      call:analyze_nav() ?><?cs
+    elif:disttools ?><?cs
+      call:disttools_nav() ?><?cs
+    elif:stories ?><?cs
+      call:stories_nav() ?><?cs
+    /if ?><?cs
+  elif:about ?><?cs
+    call:about_nav() ?><?cs
+  elif:distribute ?><?cs
+    call:distribute_nav() ?><?cs
+  elif:wear ?><?cs
+    call:wear_nav() ?><?cs
+  elif:preview ?><?cs
+    call:preview_nav() ?><?cs
+  else ?><?cs
+    call:default_left_nav() ?> <?cs
+  /if ?><?cs
+/def ?>
+
+<?cs # appears at the bottom of every page ?><?cs 
+def:custom_cc_copyright() ?>
+  Except as noted, this content is 
   licensed under <a href="http://creativecommons.org/licenses/by/2.5/">
-  Creative Commons Attribution 2.5</a>. For details and
+  Creative Commons Attribution 2.5</a>. For details and 
-  restrictions, see the <a href="<?cs var:toroot ?>license.html">Content
+  restrictions, see the <a href="<?cs var:toroot ?>license.html">Content 
-  License</a>.
+  License</a>.<?cs 
-<?cs /def ?>
+/def ?>
 
-<?cs def:custom_copyright() ?>
+<?cs 
+def:custom_copyright() ?>
   Except as noted, this content is licensed under <a
-  href="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</a>.
+  href="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</a>. 
   For details and restrictions, see the <a href="<?cs var:toroot ?>license.html">
-  Content License</a>.
+  Content License</a>.<?cs 
+/def ?>
+
+<?cs 
+def:custom_footerlinks() ?>
+  <p>
+    <a href="<?cs var:toroot ?>about/index.html">About Android</a>&nbsp;&nbsp;|&nbsp;
+    <a href="<?cs var:toroot ?>legal.html">Legal</a>&nbsp;&nbsp;|&nbsp;
+    <a href="<?cs var:toroot ?>support.html">Support</a>
+  </p><?cs 
+/def ?>
+
+<?cs # appears on the right side of the blue bar at the bottom off every page ?><?cs 
+def:custom_buildinfo() ?><?cs
+  if:!google && !reference.gcm && !reference.gms ?>
+    Android <?cs var:sdk.version ?>&nbsp;r<?cs var:sdk.rel.id ?> &mdash; <?cs
+  /if ?>
+<script src="<?cs var:toroot ?>timestamp.js" type="text/javascript"></script>
+<script>document.write(BUILD_TIMESTAMP)</script>
 <?cs /def ?>
 
-<?cs def:custom_footerlinks() ?>
-  <a href="<?cs var:toroot ?>about/android.html">About Android</a>
-  <a href="<?cs var:toroot ?>auto/index.html">Auto</a>
-  <a href="<?cs var:toroot ?>tv/index.html">TV</a>
-  <a href="<?cs var:toroot ?>wear/index.html">Wear</a>
-  <a href="<?cs var:toroot ?>legal.html">Legal</a>
-<?cs /def ?>
-
-<?cs # appears on the right side of the blue bar at the bottom off every page ?>
-<?cs def:custom_buildinfo() ?>
-  <?cs if:!google && !reference.gcm && !reference.gms ?>
-    Android <?cs var:sdk.version ?>&nbsp;r<?cs var:sdk.rel.id ?> &mdash;
-  <?cs /if ?>
-  <script src="<?cs var:toroot ?>timestamp.js" type="text/javascript"></script>
-  <script>document.write(BUILD_TIMESTAMP)</script>
-<?cs /def ?>

tools/droiddoc/templates-sdk-dev/designpage.cs

@@ -37,11 +37,17 @@
 
 <?cs if:header.hide ?>
 <?cs else ?>
-<div class="content-header <?cs if:header.justLinks ?>just-links<?cs /if ?>">
+<div class="layout-content-row content-header <?cs if:header.justLinks ?>just-links<?cs /if ?>">
+  <div class="layout-content-col span-9">
     <?cs if:header.justLinks ?>&nbsp;
       <?cs elif:header.title ?><h2><?cs var:header.title ?></h2>
                    <?cs else ?><h2><?cs var:page.title ?></h2>
     <?cs /if ?>
+  </div>
+  <div class="paging-links layout-content-col span-4" itemscope itemtype="http://schema.org/SiteNavigationElement">
+    <a href="#" class="prev-page-link">Previous</a>
+    <a href="#" class="next-page-link">Next</a>
+  </div>
 </div>
 <?cs /if ?>
 
@@ -49,9 +55,9 @@
 
 <?cs if:footer.hide ?>
 <?cs else ?>
-<div class="cols content-footer" itemscope itemtype="http://schema.org/SiteNavigationElement">
+<div class="layout-content-row content-footer" itemscope itemtype="http://schema.org/SiteNavigationElement">
-  <div class="paging-links col-9">&nbsp;</div>
+  <div class="paging-links layout-content-col span-9">&nbsp;</div>
-  <div class="paging-links col-4">
+  <div class="paging-links layout-content-col span-4">
     <a href="#" class="prev-page-link">Previous</a>
     <a href="#" class="next-page-link">Next</a>
   </div>

tools/droiddoc/templates-sdk-dev/docpage.cs

@@ -4,63 +4,46 @@
 <?cs include:"head_tag.cs" ?>
 <body class="gc-documentation
 
-<?cs # add document classes for navigation header selection (and other stuff) ?>
 <?cs
-  if:(google || reference.gms || reference.gcm) ?>google <?cs /if ?><?cs
+if:(google || reference.gms || reference.gcm) ?>google<?cs /if ?><?cs
-  if:ndk ?>ndk<?cs
+  if:(guide||develop||training||reference||tools||sdk||samples) ?>develop<?cs
     if:guide ?> guide<?cs /if ?><?cs
     if:samples ?> samples<?cs /if ?><?cs
-    if:reference ?> reference<?cs /if ?><?cs
+  elif:(distribute||googleplay||essentials||users||engage||monetize||disttools||stories)
-    if:downloads ?> downloads<?cs /if ?><?cs
+    ?>distribute<?cs
-  else ?><?cs
+    if:googleplay ?> googleplay<?cs /if ?><?cs
-    if:(guide||develop||training||reference||tools||sdk||google||samples) ?>develop<?cs
+    if:essentials ?> essentials<?cs /if ?><?cs
-      if:guide ?> guide<?cs /if ?><?cs
+    if:users ?> users<?cs /if ?><?cs
-      if:samples ?> samples<?cs /if ?><?cs
+    if:engage ?> engage<?cs /if ?><?cs
-    elif:(distribute||googleplay||essentials||users||engage||monetize||disttools||stories||analyze) ?>distribute<?cs
+    if:monetize ?> monetize<?cs /if ?><?cs
-      if:googleplay ?> googleplay<?cs /if ?><?cs
+    if:disttools ?> disttools<?cs /if ?><?cs
-      if:essentials ?> essentials<?cs /if ?><?cs
+    if:stories ?> stories<?cs /if ?><?cs
-      if:users ?> users<?cs /if ?><?cs
+  elif:(about||wear||tv||auto) ?>about<?cs
-      if:engage ?> engage<?cs /if ?><?cs
+  elif:design ?>design<?cs
-      if:monetize ?> monetize<?cs /if ?><?cs
+/if ?><?cs
-      if:disttools ?> disttools<?cs /if ?><?cs
+if:page.trainingcourse ?> trainingcourse<?cs
-      if:stories ?> stories<?cs /if ?><?cs
-      if:analyze ?> analyze<?cs /if ?><?cs
-    elif:(design||vision||material||patterns||devices||designdownloads) ?> design<?cs
-      if:vision ?> vision<?cs /if ?><?cs
-      if:material ?> material<?cs /if ?><?cs
-      if:patterns ?> patterns<?cs /if ?><?cs
-      if:devices ?> devices<?cs /if ?><?cs
-      if:designdownloads ?> designdownloads<?cs /if ?><?cs
-    elif:(about||versions||wear||tv||auto) ?> about<?cs
-      if:versions ?> versions<?cs /if ?><?cs
-      if:wear ?> wear<?cs /if ?><?cs
-      if:tv ?> tv<?cs /if ?><?cs
-      if:auto ?> auto<?cs /if ?><?cs
-    elif:(preview) ?> preview<?cs
-    /if ?><?cs
-    if:page.trainingcourse ?> trainingcourse<?cs /if ?><?cs
 /if ?>" itemscope itemtype="http://schema.org/Article"><?cs
 include:"header.cs" ?>
 
-<?cs if:(design||training||walkthru) && !page.trainingcourse && !page.article ?><?cs
+<div <?cs
-# header logic for docs that provide previous/next buttons ?>
+  if:fullpage
-  <?cs if:(header.hide||devsite) ?>
+    ?>class="fullpage"<?cs
+  elif:(design||tools||about||sdk||googleplay||essentials||users||monetize||disttools) && !nonavpage
+    ?>class="col-13" id="doc-col"<?cs
+  elif:!nonavpage
+    ?>class="col-12" id="doc-col"<?cs /if ?> >
+
+<?cs if:(design||training||walkthru) && !page.trainingcourse && !page.article ?><?cs # header logic for docs that provide previous/next buttons ?>
+  <?cs if:header.hide ?>
   <?cs else ?>
-  <div class="content-header <?cs if:header.justLinks ?>just-links<?cs /if ?>">
+  <div class="layout-content-row content-header <?cs if:header.justLinks ?>just-links<?cs /if ?>">
+    <div class="layout-content-col <?cs if:training ?>span-7<?cs else ?>span-9<?cs /if ?>">
       <?cs if:header.justLinks ?>&nbsp;
-      <?cs else ?>
+      <?cs else ?><h1 itemprop="name"><?cs var:page.title ?></h1>
-        <ul class="dac-header-crumbs">
-          <?cs # More <li> elements added here with javascript ?>
-        </ul>
-
-        <!-- Breadcrumb Setup -->
-        <script>$('.dac-nav-list').dacCurrentPage().dacCrumbs();</script>
-
-        <h1 itemprop="name"><?cs var:page.title ?>
-      </h1>
       <?cs /if ?>
+    </div>
     <?cs if:training ?>
-      <div class="training-nav-top" itemscope itemtype="http://schema.org/SiteNavigationElement">
+      <div class="training-nav-top layout-content-col span-5" itemscope itemtype="http://schema.org/SiteNavigationElement">
         <a href="#" class="prev-page-link hide"
             zh-tw-lang="上一堂課"
             zh-cn-lang="上一课"
@@ -87,7 +70,7 @@ include:"header.cs" ?>
             >Get started</a>
       </div>
     <?cs elif:!page.trainingcourse ?>
-      <?cs # <div class="paging-linkss" itemscope itemtype="http://schema.org/SiteNavigationElement">
+      <div class="paging-links layout-content-col span-4" itemscope itemtype="http://schema.org/SiteNavigationElement">
         <a href="#" class="prev-page-link hide"
             zh-tw-lang="上一堂課"
             zh-cn-lang="上一课"
@@ -104,7 +87,7 @@ include:"header.cs" ?>
             ja-lang="次へ"
             es-lang="Siguiente"
             >Next</a>
-      </div> ?>
+      </div>
     <?cs /if ?><?cs # end if training ?>
   </div>
   <?cs /if ?><?cs # end if header.hide ?>
@@ -129,34 +112,25 @@ include:"header.cs" ?>
 </style>
   <?cs /if ?>
 
-  <?cs if:(!fullpage && !header.hide && !devsite) ?>
+  <?cs if:(!fullpage && !header.hide) ?>
     <?cs if:page.landing ?><?cs # header logic for docs that are landing pages ?>
       <div class="landing-banner">
         <?cs if:page.landing.image ?><?cs # use two-column layout only if there is an image ?>
-        <div class="cols">
+        <div class="col-6">
-          <div class="col-6">
+          <img src="<?cs var:toroot ?><?cs var:page.landing.image ?>" alt="" />
-            <img src="<?cs var:toroot ?><?cs var:page.landing.image ?>" alt="" />
+        </div>
-          </div>
+        <div class="col-6">
-          <div class="col-6">
         <?cs /if ?>
           <h1 itemprop="name" style="margin-bottom:0;"><?cs var:page.title ?></h1>
           <p itemprop="description"><?cs var:page.landing.intro ?></p>
 
           <p><a class="next-page-link topic-start-link"></a></p>
         <?cs if:page.landing.image ?>
-          </div>
         </div>
         <?cs /if ?>
       </div>
     <?cs else ?>
       <?cs if:tab1 ?><div id="title-tabs-wrapper"><?cs /if ?>
-        <ul class="dac-header-crumbs">
-          <?cs # More <li> elements added here with javascript ?>
-        </ul>
-
-        <!-- Breadcrumb Setup -->
-        <p><script>$('.dac-nav-list').dacCurrentPage().dacCrumbs();</script></p>
-
         <h1 itemprop="name" <?cs if:tab1 ?>class="with-title-tabs"<?cs /if ?>><?cs var:page.title ?></h1><?cs
           if:tab1 ?><ul id="title-tabs">
               <li class="selected"><a href="<?cs var:tab1.link ?>"><?cs var:tab1 ?></a></li>
@@ -171,63 +145,21 @@ include:"header.cs" ?>
   <?cs /if ?>
 <?cs /if ?><?cs # end if design ?>
 
-  <?cs if devsite ?>
-    <?cs if:tab1 ?>
-    <div id="title-tabs-wrapper">
-      <ul id="title-tabs">
-        <li class="selected"><a href="<?cs var:tab1.link ?>"><?cs var:tab1 ?></a></li>
-        <?cs if:tab2 ?>
-        <li><a href="<?cs var:tab2.link ?>"><?cs var:tab2 ?></a></li><?cs /if ?>
-        <?cs if:tab3 ?>
-        <li><a href="<?cs var:tab3.link ?>"><?cs var:tab3 ?></a></li><?cs /if ?>
-      </ul>
-    </div><!-- end tab-wrapper -->
-    <?cs /if ?>
-  <?cs /if ?>
-
   <?cs # THIS IS THE MAIN DOC CONTENT ?>
   <div id="jd-content">
+
+
     <div class="jd-descr" itemprop="articleBody">
-    <?cs if:(!fullpage && !header.hide && devsite) ?>
-      <?cs if:page.landing ?><?cs # header logic for docs that are landing pages ?>
-        <div class="landing-banner">
-          <?cs if:page.landing.image ?><?cs # use two-column layout only if there is an image ?>
-          <div class="cols">
-            <div class="col-6">
-              <img src="<?cs var:toroot ?><?cs var:page.landing.image ?>" alt="" />
-            </div>
-            <div class="col-6">
-          <?cs /if ?>
-            <h1 itemprop="name" style="margin-bottom:0;"><?cs var:page.title ?></h1>
-            <p itemprop="description"><?cs var:page.landing.intro ?></p>
-
-            <p><a class="next-page-link topic-start-link"></a></p>
-          <?cs if:page.landing.image ?>
-            </div>
-          </div>
-          <?cs /if ?>
-        </div>
-      <?cs /if ?>
-    <?cs /if ?>
-
     <?cs call:tag_list(root.descr) ?>
     </div>
 
-    <?cs if:!fullscreen && (design||training||walkthru) && !page.landing && !page.trainingcourse
-      && !footer.hide && !devsite?>
       <div class="content-footer <?cs
-                    if:fullpage ?>wrap<?cs /if ?>"
+                    if:fullpage ?>wrap<?cs
+                    else ?>layout-content-row<?cs /if ?>"
                     itemscope itemtype="http://schema.org/SiteNavigationElement">
-          <div class="paging-links">
+        <?cs if:!fullscreen ?>
-            <a href="#" class="prev-page-link hide"
+        <div class="paging-links layout-content-col col-10">
-              zh-tw-lang="上一堂課"
+          <?cs if:(design||training||walkthru) && !page.landing && !page.trainingcourse && !footer.hide ?>
-              zh-cn-lang="上一课"
-              ru-lang="Предыдущий"
-              ko-lang="이전"
-              ja-lang="前へ"
-              es-lang="Anterior"
-              ><span class="page-link-caption">Previous</span>
-            </a>
             <a href="#" class="next-page-link hide"
                 zh-tw-lang="下一堂課"
                 zh-cn-lang="下一课"
@@ -235,8 +167,7 @@ include:"header.cs" ?>
                 ko-lang="다음"
                 ja-lang="次へ"
                 es-lang="Siguiente"
-                ><span class="page-link-caption">Next</span>
+                >Next</a>
-            </a>
             <a href="#" class="start-class-link hide"
                 zh-tw-lang="開始上課"
                 zh-cn-lang="开始"
@@ -245,18 +176,31 @@ include:"header.cs" ?>
                 ja-lang="開始する"
                 es-lang="Empezar"
                 >Get started</a>
-            <a href="#" class="next-class-link hide">
+            <a href="#" class="next-class-link hide">Next class</a>
-              <span class="page-link-caption">Next class</span>
+          <?cs /if ?>
-            </a>
+        </div>
-          </div>
+        <div class="layout-content-col plus-container col-2" >
+          <?cs if:!page.noplus ?><?cs if:fullpage ?><style>#___plusone_0 {float:right !important;}</style><?cs /if ?>
+            <div class="g-plusone" data-size="medium"></div>
+          <?cs /if ?>
+        </div>
+        <?cs /if ?>
       </div>
-    <?cs /if ?>
 
   </div> <!-- end jd-content -->
 
-<?cs if:!devsite ?>
 <?cs include:"footer.cs" ?>
+</div><!-- end doc-content -->
+
 <?cs include:"trailer.cs" ?>
-<?cs /if ?>
+  <script src="https://developer.android.com/ytblogger_lists_unified.js" type="text/javascript"></script>
+  <script src="<?cs var:toroot ?>jd_lists_unified.js?v=9" type="text/javascript"></script>
+  <script src="<?cs var:toroot ?>jd_extras.js?v=11" type="text/javascript"></script>
+  <script src="<?cs var:toroot ?>jd_collections.js?v=12" type="text/javascript"></script>
+  <script src="<?cs var:toroot ?>jd_tag_helpers.js?v=5" type="text/javascript"></script>
+
 </body>
 </html>
+
+
+

tools/droiddoc/templates-sdk-dev/footer.cs

@@ -1,219 +1,20 @@
-<?cs # page footer content ?>
+<div id="footer" class="wrap" <?cs if:fullpage ?>style="width:940px"<?cs /if ?>>
-<div class="wrap">
+        
-  <div class="dac-footer<?cs if:fullpage ?> dac-landing<?cs /if ?>">
+<?cs if:reference ?>
-    <div class="cols dac-footer-main">
+  <div id="copyright">
-      <div class="col-1of2">
+    <?cs call:custom_copyright() ?>
-        <a class="dac-footer-getnews" id="newsletter" data-modal-toggle="newsletter" href="javascript:;">Get news &amp; tips <span
-          class="dac-fab dac-primary"><i class="dac-sprite dac-mail"></i></span></a>
-      </div>
-      <div class="col-1of2 dac-footer-reachout">
-        <div class="dac-footer-contact">
-          <a class="dac-footer-contact-link" href="http://android-developers.blogspot.com/">Blog</a>
-          <a class="dac-footer-contact-link" href="/support.html">Support</a>
-        </div>
-        <div class="dac-footer-social">
-          <a class="dac-button-social dac-youtube dac-footer-social-link" href="https://www.youtube.com/user/androiddevelopers"><i class="dac-sprite dac-youtube"></i></a>
-          <a class="dac-button-social dac-gplus dac-footer-social-link" href="https://plus.google.com/+AndroidDevelopers"><i class="dac-sprite dac-gplus"></i></a>
-          <a class="dac-button-social dac-twitter dac-footer-social-link" href="https://twitter.com/AndroidDev"><i class="dac-sprite dac-twitter"></i></a>
-        </div>
-      </div>
-    </div>
-
-    <hr class="dac-footer-separator"/>
-
-    <?cs if:reference ?>
-      <p class="dac-footer-copyright">
-        <?cs call:custom_copyright() ?>
-      </p>
-      <p class="dac-footer-build">
-        <?cs call:custom_buildinfo() ?>
-      </p>
-    <?cs elif:!hide_license_footer ?>
-      <p class="dac-footer-copyright">
-        <?cs call:custom_cc_copyright() ?>
-      </p>
-    <?cs /if ?>
-
-    <p class="dac-footer-links">
-      <a href="/about/android.html">About Android</a>
-      <a href="/auto/index.html">Auto</a>
-      <a href="/tv/index.html">TV</a>
-      <a href="/wear/index.html">Wear</a>
-      <a href="/legal.html">Legal</a>
-
-      <span id="language" class="locales">
-        <select name="language" onchange="changeLangPref(this.value, true)">
-          <option value="en" selected="selected">English</option>
-          <option value="es">Español</option>
-          <option value="in">Bahasa Indonesia</option>
-          <option value="ja">日本語</option>
-          <option value="ko">한국어</option>
-          <option value="pt-br">Português Brasileiro</option>
-          <option value="ru">Русский</option>
-          <option value="vi">tiếng Việt</option>
-          <option value="zh-cn">中文（简体)</option>
-          <option value="zh-tw">中文（繁體)</option>
-        </select>
-      </span>
-    </p>
   </div>
-</div>
+  <div id="build_info">
-<!-- end footer -->
+    <?cs call:custom_buildinfo() ?>
-
-<?cs call:toast() ?>
-
-<div data-modal="newsletter" data-newsletter data-swap class="dac-modal newsletter">
-  <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>
-        <div class="dac-swap" data-swap-container>
-          <section class="dac-swap-section dac-active dac-down">
-            <h2 class="norule dac-modal-header-title" data-t="newsletter.title"></h2>
-            <p class="dac-modal-header-subtitle" data-t="newsletter.requiredHint"></p>
-          </section>
-          <section class="dac-swap-section dac-up">
-            <h2 class="norule dac-modal-header-title" data-t="newsletter.successTitle">Hooray!</h2>
-          </section>
-        </div>
-      </header>
-      <div class="dac-swap" data-swap-container>
-        <section class="dac-swap-section dac-active dac-left">
-          <form action="https://docs.google.com/forms/d/1QgnkzbEJIDu9lMEea0mxqWrXUJu0oBCLD7ar23V0Yys/formResponse" class="dac-form" method="post" target="dac-newsletter-iframe">
-            <input type="hidden" name="entry.935454734" data-newsletter-language>
-            <section class="dac-modal-content">
-              <fieldset class="dac-form-fieldset">
-                <div class="cols">
-                  <div class="col-1of2 newsletter-leftCol">
-                    <div class="dac-form-input-group">
-                      <label for="newsletter-full-name" class="dac-form-floatlabel" data-t="newsletter.name">Full name</label>
-                      <input type="text" class="dac-form-input" name="entry.1357890476" id="newsletter-full-name" required>
-                      <span class="dac-form-required">*</span>
-                    </div>
-                    <div class="dac-form-input-group">
-                      <label for="newsletter-email" class="dac-form-floatlabel" data-t="newsletter.email">Email address</label>
-                      <input type="email" class="dac-form-input" name="entry.472100832" id="newsletter-email" required>
-                      <span class="dac-form-required">*</span>
-                    </div>
-                  </div>
-                  <div class="col-1of2 newsletter-rightCol">
-                    <div class="dac-form-input-group">
-                      <label for="newsletter-company" class="dac-form-floatlabel" data-t="newsletter.company">Company / developer name</label>
-                      <input type="text" class="dac-form-input" name="entry.1664780309" id="newsletter-company">
-                    </div>
-                    <div class="dac-form-input-group">
-                      <label for="newsletter-play-store" class="dac-form-floatlabel" data-t="newsletter.appUrl">One of your Play Store app URLs</label>
-                      <input type="url" class="dac-form-input" name="entry.47013838" id="newsletter-play-store" required>
-                      <span class="dac-form-required">*</span>
-                    </div>
-                  </div>
-                </div>
-              </fieldset>
-              <fieldset class="dac-form-fieldset">
-                <div class="cols">
-                  <div class="col-1of2 newsletter-leftCol">
-                    <legend class="dac-form-legend"><span data-t="newsletter.business.label">Which best describes your business:</span><span class="dac-form-required">*</span>
-                    </legend>
-                    <div class="dac-form-radio-group">
-                      <input type="radio" value="Apps" class="dac-form-radio" name="entry.1796324055" id="newsletter-business-type-app" required>
-                      <label for="newsletter-business-type-app" class="dac-form-radio-button"></label>
-                      <label for="newsletter-business-type-app" class="dac-form-label" data-t="newsletter.business.apps">Apps</label>
-                    </div>
-                    <div class="dac-form-radio-group">
-                      <input type="radio" value="Games" class="dac-form-radio" name="entry.1796324055" id="newsletter-business-type-games" required>
-                      <label for="newsletter-business-type-games" class="dac-form-radio-button"></label>
-                      <label for="newsletter-business-type-games" class="dac-form-label" data-t="newsletter.business.games">Games</label>
-                    </div>
-                    <div class="dac-form-radio-group">
-                      <input type="radio" value="Apps and Games" class="dac-form-radio" name="entry.1796324055" id="newsletter-business-type-appsgames" required>
-                      <label for="newsletter-business-type-appsgames" class="dac-form-radio-button"></label>
-                      <label for="newsletter-business-type-appsgames" class="dac-form-label" data-t="newsletter.business.both">Apps &amp; Games</label>
-                    </div>
-                  </div>
-                  <div class="col-1of2 newsletter-rightCol newsletter-checkboxes">
-                    <div class="dac-form-radio-group">
-                      <div class="dac-media">
-                        <div class="dac-media-figure">
-                          <input type="checkbox" class="dac-form-checkbox" name="entry.732309842" id="newsletter-add" required value="Add me to the mailing list for the monthly newsletter and occasional emails about development and Google Play opportunities.">
-                          <label for="newsletter-add" class="dac-form-checkbox-button"></label>
-                        </div>
-                        <div class="dac-media-body">
-                          <label for="newsletter-add" class="dac-form-label dac-form-aside"><span data-t="newsletter.confirmMailingList"></span><span class="dac-form-required">*</span></label>
-                        </div>
-                      </div>
-                    </div>
-                    <div class="dac-form-radio-group">
-                      <div class="dac-media">
-                        <div class="dac-media-figure">
-                          <input type="checkbox" class="dac-form-checkbox" name="entry.2045036090" id="newsletter-terms" required value="I acknowledge that the information provided in this form will be subject to Google's privacy policy (https://www.google.com/policies/privacy/).">
-                          <label for="newsletter-terms" class="dac-form-checkbox-button"></label>
-                        </div>
-                        <div class="dac-media-body">
-                          <label for="newsletter-terms" class="dac-form-label dac-form-aside"><span data-t="newsletter.privacyPolicy" data-t-html></span><span class="dac-form-required">*</span></label>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </fieldset>
-            </section>
-            <footer class="dac-modal-footer">
-              <div class="cols">
-                <div class="col-2of5">
-                </div>
-              </div>
-              <button type="submit" value="Submit" class="dac-fab dac-primary dac-large dac-modal-action"><i class="dac-sprite dac-arrow-right"></i></button>
-            </footer>
-          </form>
-        </section>
-        <section class="dac-swap-section dac-right">
-          <div class="dac-modal-content">
-            <p class="newsletter-success-message" data-t="newsletter.successDetails"></p>
-          </div>
-        </section>
-      </div>
-    </div>
   </div>
-</div>
+<?cs elif:!hide_license_footer ?>
-<!-- end newsletter modal -->
+  <div id="copyright">
-
+    <?cs call:custom_cc_copyright() ?>
-<!-- start reset language header modal -->
-<div data-modal="langform" 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"></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 langform-leftCol">
-                  <p id="resetLangText"></p>
-                  <p id="resetLangCta"></p>
-                </div>
-              </div>
-            </fieldset>
-          </section>
-          <footer class="dac-modal-footer" id="langfooter">
-            <div class="cols">
-              <div class="col-2of5">
-              </div>
-            </div>
-              <button class="button dac-primary dac-modal-action lang yes" data-t="newsletter.resetLangButtonYes" data-modal-toggle></button>
-              <button class="button dac-primary dac-modal-action lang no" data-t="newsletter.resetLangButtonNo" data-modal-toggle></button>
-            </a>
-          </footer>
-        </form>
-      </section>
-    </div>
   </div>
-</div>
+<?cs /if ?>
-<!-- end langreset modal -->
+<?cs if:!no_footer_links ?>
+  <div id="footerlinks">
+    <?cs call:custom_footerlinks() ?>
+  </div>
+<?cs /if ?>
+</div> <!-- end footer -->

tools/droiddoc/templates-sdk-dev/head_tag.cs

@@ -1,147 +1,34 @@
 <head>
 <?cs
   ####### If building devsite, add some meta data needed for when generating the top nav ######### ?>
-  <?cs
-    if:devsite ?>
-    <meta name="top_category" value="<?cs
-      if:ndk ?>ndk<?cs
-      elif:(guide||develop||training||reference||tools||sdk||google||reference.gms||reference.gcm||samples) ?>develop<?cs
-      elif:(distribute||googleplay||essentials||users||engage||monetize||disttools||stories||analyze) ?>distribute<?cs
-      elif:(design||vision||material||patterns||devices||designdownloads) ?>design<?cs
-      elif:(about||versions||wear||tv||auto) ?>about<?cs
-      elif:preview ?>preview<?cs
-      else ?>none<?cs
-      /if ?>" />
-    <?cs set:dac_subcategory_set = #1 ?>
-    <meta name="subcategory" value="<?cs
-      if:ndk ?><?cs
-        if:guide ?>guide<?cs
-        elif:samples ?>samples<?cs
-        elif:reference ?>reference<?cs
-        elif:downloads ?>downloads<?cs
-        else ?>none<?cs set:dac_subcategory_set = #0 ?><?cs /if ?><?cs
-      else ?><?cs
-        if:(guide||develop||training||reference||tools||sdk||samples) ?><?cs
-          if:guide ?>guide<?cs
-          elif:training ?><?cs
-            if:page.trainingcourse ?>trainingcourse<?cs
-            else ?>training<?cs /if ?><?cs
-          elif:reference ?>reference<?cs
-          elif:tools ?>tools<?cs
-          elif:sdk ?>sdk<?cs
-          elif:samples ?>samples<?cs
-          else ?>none<?cs set:dac_subcategory_set = #0 ?><?cs /if ?><?cs
-        elif:(google||reference.gms||reference.gcm) ?>google<?cs
-        elif:(distribute||googleplay||essentials||users||engage||monetize||disttools||stories||analyze) ?><?cs
-          if:googleplay ?>googleplay<?cs
-          elif:essentials ?>essentials<?cs
-          elif:users ?>users<?cs
-          elif:engage ?>engage<?cs
-          elif:monetize ?>monetize<?cs
-          elif:disttools ?>disttools<?cs
-          elif:stories ?>stories<?cs
-          elif:analyze ?>analyze<?cs
-          else ?>none<?cs set:dac_subcategory_set = #0 ?><?cs /if ?><?cs
-        elif:(about||versions||wear||tv||auto) ?>about<?cs
-        elif:preview ?>preview<?cs
-        elif:design ?>design<?cs
-        elif:walkthru ?>walkthru<?cs
-        else ?>none<?cs set:dac_subcategory_set = #0 ?><?cs /if ?><?cs
-      /if ?>" />
-
-    <?cs if:nonavpage ?>
-      <meta name="hide_toc" value='True' />
-    <?cs elif: !nonavpage && dac_subcategory_set ?>
-      <meta name="book_path" value="<?cs
-        if:ndk ?>/ndk<?cs
-          if:guide ?>/guides<?cs
-          elif:samples ?>/samples<?cs
-          elif:reference ?>/reference<?cs
-          elif:downloads ?>/downloads<?cs /if ?><?cs
-        else ?><?cs
-          if:(guide||develop||training||reference||tools||sdk||samples) ?><?cs
-            if:guide ?>/guide<?cs
-            elif:training ?>/training<?cs
-            elif:reference ?>/reference<?cs
-            elif:tools ?>/tools<?cs
-            elif:sdk ?>/tools<?cs
-            elif:samples ?>/samples<?cs /if ?><?cs
-          elif:(google||reference.gms||reference.gcm) ?>/google<?cs
-          elif:(distribute||googleplay||essentials||users||engage||monetize||disttools||stories||analyze) ?>/distribute<?cs
-            if:googleplay ?>/googleplay<?cs
-            elif:essentials ?>/essentials<?cs
-            elif:users ?>/users<?cs
-            elif:engage ?>/engage<?cs
-            elif:monetize ?>/monetize<?cs
-            elif:disttools ?>/disttools<?cs
-            elif:stories ?>/stories<?cs
-            elif:analyze ?>/analyze<?cs /if ?><?cs
-          elif:(about||versions||wear||tv||auto) ?>/about<?cs
-          elif:preview ?>/preview<?cs
-          elif:design ?>/design<?cs
-          elif:walkthru ?>/walkthru<?cs /if ?><?cs
-        /if ?>/_book.yaml" />
-    <?cs /if ?>
-
-    <?cs if:page.tags && page.tags != "" ?>
-      <meta name="keywords" value='<?cs var:page.tags ?>' />
-    <?cs /if ?>
-
-    <?cs if:meta.tags && meta.tags != "" ?>
-      <meta name="meta_tags" value='<?cs var:meta.tags ?>' />
-    <?cs /if ?>
-
-    <?cs if:fullpage ?>
-      <meta name="full_width" value="True" />
-    <?cs /if ?>
-
-    <?cs if:page.landing ?>
-      <meta name="page_type" value="landing" />
-    <?cs /if ?>
-
-    <?cs if:page.article ?>
-      <meta name="page_type" value="article" />
-    <?cs /if ?>
-
-    <?cs /if ?><?cs
-    # END if/else devsite ?>
 <?cs
-  if:!devsite ?>
+  if:devsite ?><?cs
+    if:guide||develop||training||reference||tools||sdk||google||samples
+      ?><meta name="top_category" value="develop" /><?cs
+    elif:google
+      ?><meta name="top_category" value="google" /><?cs
+    elif:reference && !(reference.gms || reference.gcm)
+      ?><meta name="top_category" value="css-fullscreen" /><?cs
+    /if ?>
+  <?cs
+  /if
+?><?cs
+  # END if/else devsite ?>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="viewport" content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+<meta name="viewport" content="width=<?cs
-<meta content="IE=edge" http-equiv="X-UA-Compatible">
+  if:page.viewport_width ?><?cs
-<link rel="shortcut icon" type="image/x-icon" href="<?cs var:toroot ?>favicon.ico" />
+    var:page.viewport_width ?><?cs
-<link rel="alternate" href="http://developer.android.com/<?cs var:path.canonical ?>" hreflang="en" />
+  else ?>device-width<?cs /if ?>" />
-<link rel="alternate" href="http://developer.android.com/intl/es/<?cs var:path.canonical ?>" hreflang="es" />
-<link rel="alternate" href="http://developer.android.com/intl/id/<?cs var:path.canonical ?>" hreflang="id" />
-<link rel="alternate" href="http://developer.android.com/intl/ja/<?cs var:path.canonical ?>" hreflang="ja" />
-<link rel="alternate" href="http://developer.android.com/intl/ko/<?cs var:path.canonical ?>" hreflang="ko" />
-<link rel="alternate" href="http://developer.android.com/intl/pt-br/<?cs var:path.canonical ?>" hreflang="pt-br" />
-<link rel="alternate" href="http://developer.android.com/intl/ru/<?cs var:path.canonical ?>" hreflang="ru" />
-<link rel="alternate" href="http://developer.android.com/intl/vi/<?cs var:path.canonical ?>" hreflang="vi" />
-<link rel="alternate" href="http://developer.android.com/intl/zh-cn/<?cs var:path.canonical ?>" hreflang="zh-cn" />
-<link rel="alternate" href="http://developer.android.com/intl/zh-tw/<?cs var:path.canonical ?>" hreflang="zh-tw" />
-<?cs /if ?><?cs
-# END if/else !devsite ?>
-
-<title><?cs
-if:devsite ?><?cs
-  if:page.title ?><?cs
-    var:page.title ?><?cs
-  else ?>Android Developers<?cs
-  /if ?><?cs
-else ?><?cs
-  if:page.title ?><?cs
-    var:page.title ?> | <?cs
-  /if ?>Android Developers
-<?cs /if ?><?cs
-# END if/else devsite ?></title>
 <?cs
   if:page.metaDescription ?>
-<meta name="description" content="<?cs var:page.metaDescription ?>"><?cs
+<meta name="Description" content="<?cs var:page.metaDescription ?>"><?cs
   /if ?>
-<?cs
+<link rel="shortcut icon" type="image/x-icon" href="<?cs var:toroot ?>favicon.ico" />
-  if:!devsite ?>
+<title><?cs
+  if:page.title ?><?cs
+    var:page.title ?> | <?cs
+  /if ?>Android Developers</title>
+
 <!-- STYLESHEETS -->
 <link rel="stylesheet"
 href="<?cs
@@ -151,16 +38,22 @@ if:android.whichdoc != 'online' ?>http:<?cs
 if:android.whichdoc != 'online' ?>http:<?cs
 /if ?>//fonts.googleapis.com/css?family=Roboto:light,regular,medium,thin,italic,mediumitalic,bold"
   title="roboto">
-<?cs
+<link href="<?cs var:toroot ?>assets/css/default.css?v=5" rel="stylesheet" type="text/css">
-  if:ndk ?><link rel="stylesheet" href="<?cs
+
-  if:android.whichdoc != 'online' ?>http:<?cs
+<?cs if:reference && !(reference.gms || reference.gcm || preview) ?>
-  /if ?>//fonts.googleapis.com/css?family=Roboto+Mono:400,500,700" title="roboto-mono" type="text/css"><?cs
+<!-- FULLSCREEN STYLESHEET -->
-/if ?>
+<link href="<?cs var:toroot ?>assets/css/fullscreen.css" rel="stylesheet" class="fullscreen"
-<link href="<?cs var:toroot ?>assets/css/default.css?v=16" rel="stylesheet" type="text/css">
+type="text/css">
+<?cs /if ?>
 
 <!-- JAVASCRIPT -->
 <script src="<?cs if:android.whichdoc != 'online' ?>http:<?cs /if ?>//www.google.com/jsapi" type="text/javascript"></script>
-<script src="<?cs var:toroot ?>assets/js/android_3p-bundle.js" type="text/javascript"></script><?cs
+<?cs
+if:devsite
+  ?><script src="<?cs var:toroot ?>_static/js/android_3p-bundle.js" type="text/javascript"></script><?cs
+else
+  ?><script src="<?cs var:toroot ?>assets/js/android_3p-bundle.js" type="text/javascript"></script><?cs
+/if ?><?cs
   if:page.customHeadTag ?>
 <?cs var:page.customHeadTag ?><?cs
   /if ?>
@@ -168,9 +61,15 @@ if:android.whichdoc != 'online' ?>http:<?cs
   var toRoot = "<?cs var:toroot ?>";
   var metaTags = [<?cs var:meta.tags ?>];
   var devsite = <?cs if:devsite ?>true<?cs else ?>false<?cs /if ?>;
-  var useUpdatedTemplates = <?cs if:useUpdatedTemplates ?>true<?cs else ?>false<?cs /if ?>;
 </script>
-<script src="<?cs var:toroot ?>assets/js/docs.js?v=17" type="text/javascript"></script>
+<script src="<?cs var:toroot ?>assets/js/docs.js?v=3" type="text/javascript"></script>
+
+<?cs if:helpoutsWidget ?>
+<script type="text/javascript" src="https://helpouts.google.com/ps/res/embed.js" defer async
+    data-helpouts-embed data-helpouts-vertical="programming"
+    data-helpouts-tags="<?cs var:page.tags ?>" data-helpouts-prefix="android"
+    data-helpouts-standalone="true"></script>
+<?cs /if ?>
 
 <script>
   (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
@@ -183,6 +82,5 @@ if:android.whichdoc != 'online' ?>http:<?cs
   ga('send', 'pageview');
   ga('universal.send', 'pageview'); // Send page view for new tracker.
 </script>
-<?cs /if ?><?cs
+
-# END if/else !devsite ?>
 </head>

tools/droiddoc/templates-sdk-dev/header.cs

@@ -1,11 +1,3 @@
-<?cs if:!devsite ?><?cs # leave out the global header for devsite; it is in devsite template ?>
+<?cs call:custom_masthead() ?>
-  <?cs call:custom_masthead() ?>
+<?cs call:custom_left_nav() ?>
 
-  <?cs if:(fullpage) ?>
-    <?cs call:fullpage() ?>
-  <?cs else ?>
-    <?cs call:body_content_wrap_start() ?>
-  <?cs /if ?>
-
-  <?cs call:search_results() ?>
-<?cs /if ?><?cs # end if/else !devsite ?>

tools/droiddoc/templates-sdk-dev/jd_lists_unified.cs

@@ -1,10 +1 @@
-window.METADATA = window.METADATA || {};
-METADATA['<?cs var:metadata.lang ?>'] = {};
-
-METADATA['<?cs var:metadata.lang ?>'].about = [];
-METADATA['<?cs var:metadata.lang ?>'].design = [];
-METADATA['<?cs var:metadata.lang ?>'].develop = [];
-METADATA['<?cs var:metadata.lang ?>'].distribute = [];
-METADATA['<?cs var:metadata.lang ?>'].extras = [];
-
 <?cs var:reference_tree ?>

tools/droiddoc/templates-sdk-dev/macros_override.cs

@@ -33,19 +33,4 @@
       <?cs set:count = count + #1 ?>
     <?cs /each ?>
   </table>
-<?cs /def ?>
+<?cs /def ?>
-
-<?cs
-# Prints a comma separated list of parameters with optional line breaks
-?><?cs
-def:parameter_list(params, linebreaks) ?><?cs
-  each:param = params ?><?cs
-      call:simple_type_link(param.type)?> <?cs
-      var:param.name ?><?cs
-      if: name(param)!=subcount(params)-1
-        ?>, <?cs if:linebreaks
-?>
-                <?cs /if ?><?cs
-      /if ?><?cs
-  /each ?><?cs
-/def ?>

tools/droiddoc/templates-sdk-dev/nosidenavpage.cs

@@ -11,7 +11,6 @@
 <?cs call:custom_masthead() ?>
 
 <div id="body-content">
-<div>
 <div id="doc-content" style="position:relative;">
 
 <?cs call:tag_list(root.descr) ?>

tools/droiddoc/templates-sdk-dev/package.cs

@@ -1,25 +1,50 @@
-<?cs # THIS CREATES A PACKAGE SUMMARY PAGE FROM EACH package.html FILES
+<?cs include:"doctype.cs" ?>
-     # AND NAMES IT package-summary.html ?>
 <?cs include:"macros.cs" ?>
 <?cs include:"macros_override.cs" ?>
-<?cs include:"doctype.cs" ?>
 <html<?cs if:devsite ?> devsite<?cs /if ?>>
 <?cs include:"head_tag.cs" ?>
-<?cs include:"body_tag.cs" ?>
-<?cs include:"header.cs" ?>
-<?cs include:"page_info.cs" ?>
-<div class="api apilevel-<?cs var:package.since ?>" id="jd-content">
 
-<h1><?cs var:package.name ?></h1>
+<body class="gc-documentation <?cs if:(reference.gms || reference.gcm) ?>google<?cs /if ?>
+  <?cs if:(guide||develop||training||reference||tools||sdk) ?>develop<?cs
+    if:reference ?> reference<?cs
+    /if ?><?cs
+  elif:design ?>design<?cs
+  elif:distribute ?>distribute<?cs
+  /if ?>">
+  <div id="doc-api-level" class="<?cs var:package.since ?>" style="display:none"></div>
+  <a name="top"></a>
+<?cs include:"header.cs" ?>
+
+<div class="col-12" id="doc-col">
+
+<div id="api-info-block">
+<div class="api-level">
+  <?cs call:since_tags(package) ?>
+  <?cs call:federated_refs(package) ?>
+</div>
+</div>
+
+<div id="jd-header">
+  package
+  <h1><?cs var:package.name ?></h1>
+</div><!-- end header -->
+
+<div id="naMessage"></div>
+
+<div id="jd-content" class="api apilevel-<?cs var:package.since ?>">
 
 <?cs if:subcount(package.descr) ?>
-  <?cs call:tag_list(package.descr) ?>
+  <div class="jd-descr">
+    <?cs call:tag_list(package.descr) ?>
+  </div>
 <?cs /if ?>
 
 <?cs def:class_table(label, classes) ?>
   <?cs if:subcount(classes) ?>
     <h2><?cs var:label ?></h2>
+    <div class="jd-sumtable">
     <?cs call:class_link_table(classes) ?>
+    </div>
   <?cs /if ?>
 <?cs /def ?>
 
@@ -30,10 +55,11 @@
 <?cs call:class_table("Exceptions", package.exceptions) ?>
 <?cs call:class_table("Errors", package.errors) ?>
 
-</div><!-- end apilevel -->
-<?cs if:!devsite ?>
 <?cs include:"footer.cs" ?>
+</div><!-- end jd-content -->
+</div><!-- doc-content -->
+
 <?cs include:"trailer.cs" ?>
-<?cs /if ?>
+
 </body>
 </html>

tools/droiddoc/templates-sdk-dev/packages.cs

@@ -1,19 +1,33 @@
-<?cs # THIS CREATES A LIST OF ALL PACKAGES AND NAMES IT packages.html ?>
-<?cs include:"macros.cs" ?>
 <?cs include:"doctype.cs" ?>
+<?cs include:"macros.cs" ?>
 <html<?cs if:devsite ?> devsite<?cs /if ?>>
 <?cs include:"head_tag.cs" ?>
-<?cs include:"body_tag.cs" ?>
+<body class="gc-documentation <?cs if:(reference.gms || reference.gcm) ?>google<?cs /if ?>
+  <?cs if:(guide||develop||training||reference||tools||sdk) ?>develop<?cs
+    if:reference ?> reference<?cs
+    /if ?><?cs
+  elif:design ?>design<?cs
+  elif:distribute ?>distribute<?cs
+  /if ?>">
+  <a name="top"></a>
 <?cs include:"header.cs" ?>
 
+<div class="col-12" id="doc-col">
+
+<div id="jd-header">
 <h1><?cs var:page.title ?></h1>
-<p>These are the API packages.
+</div>
-See all <a href="classes.html">API classes</a>.</p>
+
+<div id="jd-content">
+
+<div class="jd-descr">
+<p><?cs call:tag_list(root.descr) ?></p>
+</div>
 
 <?cs set:count = #1 ?>
-<table>
+<table class="jd-sumtable">
 <?cs each:pkg = docs.packages ?>
-    <tr class="api apilevel-<?cs var:pkg.since ?>" >
+    <tr class="<?cs if:count % #2 ?>alt-color<?cs /if ?> api apilevel-<?cs var:pkg.since ?>" >
         <td class="jd-linkcol"><?cs call:package_link(pkg) ?></td>
         <td class="jd-descrcol" width="100%"><?cs call:tag_list(pkg.shortDescr) ?></td>
     </tr>
@@ -21,9 +35,11 @@ See all <a href="classes.html">API classes</a>.</p>
 <?cs /each ?>
 </table>
 
-<?cs if:!devsite ?>
 <?cs include:"footer.cs" ?>
+</div><!-- end jd-content -->
+</div> <!-- end doc-content -->
+
 <?cs include:"trailer.cs" ?>
-<?cs /if ?>
+
 </body>
 </html>

tools/droiddoc/templates-sdk-dev/page_info.cs

@@ -1,109 +0,0 @@
-<?cs # optional, more info about the page, such as API level and links ?>
-<?cs
-# A modal dialog when API level is set too low for this page
-?><div id="naMessage"></div>
-<?cs
-#
-# If this is a package summary page...
-#
-?><?cs
-if:subcount(package)
-?>
-<div id="api-info-block">
-<div class="api-level">
-  <?cs call:since_tags(package) ?>
-  <?cs call:federated_refs(package) ?>
-</div>
-</div><?cs
-#
-# Or if this is a class page...
-#
-?><?cs
-elif:subcount(class)
-?>
-<div id="api-info-block">
-<div class="api-level">
-  <?cs call:since_tags(class) ?><?cs
-  if:class.deprecatedsince
-    ?><br>Deprecated since <a href="<?cs var:toroot ?>guide/topics/manifest/uses-sdk-element.html#ApiLevels"
-        >API level <?cs var:class.deprecatedsince ?></a><?cs
-  /if ?>
-  <?cs call:federated_refs(class) ?>
-</div>
-
-<?cs # Set variables about whether there are inherited members; no output ?>
-<?cs each:cl=class.inherited ?>
-  <?cs if:subcount(cl.methods) ?>
-   <?cs set:inhmethods = #1 ?>
-  <?cs /if ?>
-  <?cs if:subcount(cl.constants) ?>
-   <?cs set:inhconstants = #1 ?>
-  <?cs /if ?>
-  <?cs if:subcount(cl.fields) ?>
-   <?cs set:inhfields = #1 ?>
-  <?cs /if ?>
-  <?cs if:subcount(cl.attrs) ?>
-   <?cs set:inhattrs = #1 ?>
-  <?cs /if ?>
-<?cs /each ?>
-
-<div class="sum-details-links">
-<?cs if:inhattrs || inhconstants || inhfields || inhmethods || (!class.subclasses.hidden &&
-     (subcount(class.subclasses.direct) || subcount(class.subclasses.indirect))) ?>
-Summary:
-<?cs if:subcount(class.inners) ?>
-  <a href="#nestedclasses">Nested Classes</a>
-  <?cs set:linkcount = #1 ?>
-<?cs /if ?>
-<?cs if:subcount(class.attrs) ?>
-  <?cs if:linkcount ?>&#124; <?cs /if ?><a href="#lattrs">XML Attrs</a>
-  <?cs set:linkcount = #1 ?>
-<?cs /if ?>
-<?cs if:inhattrs ?>
-  <?cs if:linkcount ?>&#124; <?cs /if ?><a href="#inhattrs">Inherited XML Attrs</a>
-  <?cs set:linkcount = #1 ?>
-<?cs /if ?>
-<?cs if:subcount(class.enumConstants) ?>
-  <?cs if:linkcount ?>&#124; <?cs /if ?><a href="#enumconstants">Enums</a>
-  <?cs set:linkcount = #1 ?>
-<?cs /if ?>
-<?cs if:subcount(class.constants) ?>
-  <?cs if:linkcount ?>&#124; <?cs /if ?><a href="#constants">Constants</a>
-  <?cs set:linkcount = #1 ?>
-<?cs /if ?>
-<?cs if:inhconstants ?>
-  <?cs if:linkcount ?>&#124; <?cs /if ?><a href="#inhconstants">Inherited Constants</a>
-  <?cs set:linkcount = #1 ?>
-<?cs /if ?>
-<?cs if:subcount(class.fields) ?>
-  <?cs if:linkcount ?>&#124; <?cs /if ?><a href="#lfields">Fields</a>
-  <?cs set:linkcount = #1 ?>
-<?cs /if ?>
-<?cs if:inhfields ?>
-  <?cs if:linkcount ?>&#124; <?cs /if ?><a href="#inhfields">Inherited Fields</a>
-  <?cs set:linkcount = #1 ?>
-<?cs /if ?>
-<?cs if:subcount(class.ctors.public) ?>
-  <?cs if:linkcount ?>&#124; <?cs /if ?><a href="#pubctors">Ctors</a>
-  <?cs set:linkcount = #1 ?>
-<?cs /if ?>
-<?cs if:subcount(class.ctors.protected) ?>
-  <?cs if:linkcount ?>&#124; <?cs /if ?><a href="#proctors">Protected Ctors</a>
-  <?cs set:linkcount = #1 ?>
-<?cs /if ?>
-<?cs if:subcount(class.methods.public) ?>
-  <?cs if:linkcount ?>&#124; <?cs /if ?><a href="#pubmethods">Methods</a>
-  <?cs set:linkcount = #1 ?>
-<?cs /if ?>
-<?cs if:subcount(class.methods.protected) ?>
-  <?cs if:linkcount ?>&#124; <?cs /if ?><a href="#promethods">Protected Methods</a>
-  <?cs set:linkcount = #1 ?>
-<?cs /if ?>
-<?cs if:inhmethods ?>
-  <?cs if:linkcount ?>&#124; <?cs /if ?><a href="#inhmethods">Inherited Methods</a>
-<?cs /if ?>
-&#124; <a href="#" onclick="return toggleAllClassInherited()" id="toggleAllClassInherited">[Expand All]</a>
-<?cs /if ?>
-</div><!-- end sum-details-links -->
-</div><!-- end api-info-block --><?cs
-/if ?><?cs # end of if package or class ?>

tools/droiddoc/templates-sdk-dev/sample.cs

@@ -5,6 +5,11 @@
 <body class="gc-documentation develop samples" itemscope itemtype="http://schema.org/Article">
 <?cs include:"header.cs" ?>
 
+<div <?cs if:fullpage
+?>class="fullpage"<?cs elif:design||tools||about||sdk||distribute
+?>class="col-13" id="doc-col"<?cs else
+?>class="col-12" id="doc-col"<?cs /if ?> >
+
 <!-- start breadcrumb block -->
 <div id="api-info-block">
   <div class="sum-details-links">
@@ -25,7 +30,7 @@
 <div id="pathCrumb">
 <?cs each:item = parentdirs ?>
   <?cs if:LinkifyPathCrumb
-    ?><a href="<?cs var:toroot ?><?cs var:item.Link ?>"><?cs var:item.Name ?></a> /
+    ?><a href="<?cs var:toroot ?><?cs var:item.Link ?>"><?cs var:item.Name ?></a> / 
   <?cs else
     ?><?cs var:item.Name ?> / <?cs /if ?>
 <?cs /each ?>
@@ -87,9 +92,9 @@
 
       <div class="content-footer <?cs
                     if:fullpage ?>wrap<?cs
-                    else ?>cols<?cs /if ?>"
+                    else ?>layout-content-row<?cs /if ?>"
                     itemscope itemtype="http://schema.org/SiteNavigationElement">
-        <div class="<?cs
+        <div class="layout-content-col <?cs
                     if:fullpage ?>col-16<?cs
                     elif:training||guide ?>col-8<?cs
                     else ?>col-9<?cs /if ?>" style="padding-top:4px">
@@ -98,7 +103,7 @@
           <?cs /if ?>
         </div>
         <?cs if:!fullscreen ?>
-        <div class="paging-links col-4">
+        <div class="paging-links layout-content-col col-4">
           <?cs if:(design||training||walkthru) && !page.landing && !page.trainingcourse && !footer.hide ?>
             <a href="#" class="prev-page-link hide"
                 zh-tw-lang="上一堂課"
@@ -123,17 +128,24 @@
 
       <?cs # for training classes, provide a different kind of link when the next page is a different class ?>
       <?cs if:training && !page.article ?>
-      <div class="content-footer next-class" style="display:none" itemscope itemtype="http://schema.org/SiteNavigationElement">
+      <div class="layout-content-row content-footer next-class" style="display:none" itemscope itemtype="http://schema.org/SiteNavigationElement">
           <a href="#" class="next-class-link hide">Next class: </a>
       </div>
       <?cs /if ?>
 
   </div> <!-- end jd-content -->
 
-  <?cs if:!devsite ?>
+<?cs include:"footer.cs" ?>
-  <?cs include:"footer.cs" ?>
+</div><!-- end doc-content -->
-  <?cs include:"trailer.cs" ?>
+
-  <?cs /if ?>
+<?cs include:"trailer.cs" ?>
 
 </body>
 </html>
+
+
+
+
+
+
+

tools/droiddoc/templates-sdk-dev/sampleindex.cs

@@ -5,6 +5,11 @@
 <body class="gc-documentation develop samples" itemscope itemtype="http://schema.org/Article">
 <?cs include:"header.cs" ?>
 
+<div <?cs if:fullpage
+?>class="fullpage"<?cs elif:design||tools||about||sdk||distribute
+?>class="col-13" id="doc-col"<?cs else 
+?>class="col-12" id="doc-col"<?cs /if ?> >
+
 <!-- start breadcrumb block -->
 <div id="api-info-block">
 <div class="sum-details-links">
@@ -77,9 +82,9 @@
 <?cs /if ?><?cs # end if/else online docs ?>
       <div class="content-footer <?cs
                     if:fullpage ?>wrap<?cs
-                    else ?>cols<?cs /if ?>"
+                    else ?>layout-content-row<?cs /if ?>"
                     itemscope itemtype="http://schema.org/SiteNavigationElement">
-        <div class="<?cs
+        <div class="layout-content-col <?cs
                     if:fullpage ?>col-16<?cs
                     elif:training||guide ?>col-8<?cs
                     else ?>col-9<?cs /if ?>" style="padding-top:4px">
@@ -88,7 +93,7 @@
           <?cs /if ?>
         </div>
         <?cs if:!fullscreen ?>
-        <div class="paging-links col-4">
+        <div class="paging-links layout-content-col col-4">
           <?cs if:(design||training||walkthru) && !page.landing && !page.trainingcourse && !footer.hide ?>
             <a href="#" class="prev-page-link hide"
                 zh-tw-lang="上一堂課"
@@ -113,7 +118,7 @@
 
       <?cs # for training classes, provide a different kind of link when the next page is a different class ?>
       <?cs if:training && !page.article ?>
-      <div class="content-footer next-class" style="display:none" itemscope itemtype="http://schema.org/SiteNavigationElement">
+      <div class="layout-content-row content-footer next-class" style="display:none" itemscope itemtype="http://schema.org/SiteNavigationElement">
           <a href="#" class="next-class-link hide">Next class: </a>
       </div>
       <?cs /if ?>
@@ -121,6 +126,7 @@
   </div> <!-- end jd-content -->
 
 <?cs include:"footer.cs" ?>
+</div><!-- end doc-content -->
 
 <?cs include:"trailer.cs" ?>
 

tools/droiddoc/templates-sdk-dev/sdkpage.cs

@@ -1,6 +1,5 @@
 <?cs include:"doctype.cs" ?>
 <?cs include:"macros.cs" ?>
-<?cs include:"../../../../frameworks/base/docs/html/sdk/sdk_vars.cs" ?>
 <html<?cs if:devsite ?> devsite<?cs /if ?>>
 <?cs if:sdk.redirect ?>
   <head>
@@ -81,20 +80,20 @@
       <th>Platform</th>
       <th>Package</th>
       <th style="white-space:nowrap">Size (Bytes)</th>
-      <th>SHA1 Checksum</th>
+      <th>MD5 Checksum</th>
   </tr>
   <tr>
     <td>Windows 32-bit</td>
     <td>
-  <a onClick="return onDownload(this)" data-modal-toggle="ndk_tos"
+  <a onClick="return onDownload(this)"
-     href="http://dl.google.com/android/repository/<?cs var:ndk.win32_download ?>"><?cs var:ndk.win32_download ?></a>
+     href="http://dl.google.com/android/ndk/<?cs var:ndk.win32_download ?>"><?cs var:ndk.win32_download ?></a>
     </td>
     <td><?cs var:ndk.win32_bytes ?></td>
     <td><?cs var:ndk.win32_checksum ?></td>
   </tr>
  <!-- <tr>
    <td>
-  <a onClick="return onDownload(this)" data-modal-toggle="ndk_tos"
+  <a onClick="return onDownload(this)"
      href="http://dl.google.com/android/ndk/<?cs var:ndk.win32.legacy_download ?>"><?cs var:ndk.win32.legacy_download ?></a>
     </td>
     <td><?cs var:ndk.win32.legacy_bytes ?></td>
@@ -103,59 +102,66 @@
   <tr>
     <td>Windows 64-bit</td>
     <td>
-  <a onClick="return onDownload(this)" data-modal-toggle="ndk_tos"
+  <a onClick="return onDownload(this)"
-     href="http://dl.google.com/android/repository/<?cs var:ndk.win64_download ?>"><?cs var:ndk.win64_download ?></a>
+     href="http://dl.google.com/android/ndk/<?cs var:ndk.win64_download ?>"><?cs var:ndk.win64_download ?></a>
     </td>
     <td><?cs var:ndk.win64_bytes ?></td>
     <td><?cs var:ndk.win64_checksum ?></td>
   </tr>
  <!--  <tr>
     <td>
-  <a onClick="return onDownload(this)" data-modal-toggle="ndk_tos"
+  <a onClick="return onDownload(this)"
-     href="http://dl.google.com/android/repository/<?cs var:ndk.win64.legacy_download ?>"><?cs var:ndk.win64.legacy_download ?></a>
+     href="http://dl.google.com/android/ndk/<?cs var:ndk.win64.legacy_download ?>"><?cs var:ndk.win64.legacy_download ?></a>
     </td>
     <td><?cs var:ndk.win64.legacy_bytes ?></td>
     <td><?cs var:ndk.win64.legacy_checksum ?></td>
   </tr> -->
-<!--   (this item is deprecated)
   <tr>
     <td>Mac OS X 32-bit</td>
     <td>
-  <a onClick="return onDownload(this)" data-modal-toggle="ndk_tos"
+  <a onClick="return onDownload(this)"
-     href="http://dl.google.com/android/repository/<?cs var:ndk.mac32_download ?>"><?cs var:ndk.mac32_download ?></a>
+     href="http://dl.google.com/android/ndk/<?cs var:ndk.mac32_download ?>"><?cs var:ndk.mac32_download ?></a>
     </td>
     <td><?cs var:ndk.mac32_bytes ?></td>
     <td><?cs var:ndk.mac32_checksum ?></td>
-  </tr> -->
+  </tr>
- <!-- (this item is deprecated)
+ <!--  <tr>
-  <tr>
     <td>
-  <a onClick="return onDownload(this)" data-modal-toggle="ndk_tos"
+  <a onClick="return onDownload(this)"
-     href="http://dl.google.com/android/repository/<?cs var:ndk.mac32.legacy_download ?>"><?cs var:ndk.mac32.legacy_download ?></a>
+     href="http://dl.google.com/android/ndk/<?cs var:ndk.mac32.legacy_download ?>"><?cs var:ndk.mac32.legacy_download ?></a>
     </td>
     <td><?cs var:ndk.mac32.legacy_bytes ?></td>
     <td><?cs var:ndk.mac32.legacy_checksum ?></td>
   </tr> -->
     <td>Mac OS X 64-bit</td>
     <td>
-  <a onClick="return onDownload(this)" data-modal-toggle="ndk_tos"
+  <a onClick="return onDownload(this)"
-     href="http://dl.google.com/android/repository/<?cs var:ndk.mac64_download ?>"><?cs var:ndk.mac64_download ?></a>
+     href="http://dl.google.com/android/ndk/<?cs var:ndk.mac64_download ?>"><?cs var:ndk.mac64_download ?></a>
     </td>
     <td><?cs var:ndk.mac64_bytes ?></td>
     <td><?cs var:ndk.mac64_checksum ?></td>
   </tr>
  <!--  <tr>
     <td>
-  <a onClick="return onDownload(this)" data-modal-toggle="ndk_tos"
+  <a onClick="return onDownload(this)"
-     href="http://dl.google.com/android/repository/<?cs var:ndk.mac64.legacy_download ?>"><?cs var:ndk.mac64.legacy_download ?></a>
+     href="http://dl.google.com/android/ndk/<?cs var:ndk.mac64.legacy_download ?>"><?cs var:ndk.mac64.legacy_download ?></a>
     </td>
     <td><?cs var:ndk.mac64.legacy_bytes ?></td>
     <td><?cs var:ndk.mac64.legacy_checksum ?></td>
   </tr> -->
+  <tr>
+    <td>Linux 32-bit (x86)</td>
+    <td>
+  <a onClick="return onDownload(this)"
+     href="http://dl.google.com/android/ndk/<?cs var:ndk.linux32_download ?>"><?cs var:ndk.linux32_download ?></a>
+    </td>
+    <td><?cs var:ndk.linux32_bytes ?></td>
+    <td><?cs var:ndk.linux32_checksum ?></td>
+  </tr>
  <!--  <tr>
     <td>
-  <a onClick="return onDownload(this)" data-modal-toggle="ndk_tos"
+  <a onClick="return onDownload(this)"
-     href="http://dl.google.com/android/repository/<?cs var:ndk.linux32.legacy_download ?>"><?cs var:ndk.linux32.legacy_download ?></a>
+     href="http://dl.google.com/android/ndk/<?cs var:ndk.linux32.legacy_download ?>"><?cs var:ndk.linux32.legacy_download ?></a>
     </td>
     <td><?cs var:ndk.linux32.legacy_bytes ?></td>
     <td><?cs var:ndk.linux32.legacy_checksum ?></td>
@@ -163,16 +169,16 @@
   <tr>
     <td>Linux 64-bit (x86)</td>
     <td>
-  <a onClick="return onDownload(this)" data-modal-toggle="ndk_tos"
+  <a onClick="return onDownload(this)"
-     href="http://dl.google.com/android/repository/<?cs var:ndk.linux64_download ?>"><?cs var:ndk.linux64_download ?></a>
+     href="http://dl.google.com/android/ndk/<?cs var:ndk.linux64_download ?>"><?cs var:ndk.linux64_download ?></a>
     </td>
     <td><?cs var:ndk.linux64_bytes ?></td>
     <td><?cs var:ndk.linux64_checksum ?></td>
   </tr>
   <!--  <tr>
     <td>
-  <a onClick="return onDownload(this)" data-modal-toggle="ndk_tos"
+  <a onClick="return onDownload(this)"
-     href="http://dl.google.com/android/repository/<?cs var:ndk.linux64.legacy_download ?>"><?cs var:ndk.linux64.legacy_download ?></a>
+     href="http://dl.google.com/android/ndk/<?cs var:ndk.linux64.legacy_download ?>"><?cs var:ndk.linux64.legacy_download ?></a>
     </td>
     <td><?cs var:ndk.linux64.legacy_bytes ?></td>
     <td><?cs var:ndk.linux64.legacy_checksum ?></td>
@@ -184,13 +190,16 @@
   <?cs call:tag_list(root.descr) ?>
 
 
-<?cs ########  The NDK version of the download script ######### ?>
+
 <script>
   function onDownload(link) {
 
     $("#downloadForRealz").html("Download " + $(link).text());
     $("#downloadForRealz").attr('href',$(link).attr('href'));
 
+    $("#tos").fadeIn('slow');
+
+    location.hash = "download";
     return false;
   }
 
@@ -203,28 +212,25 @@
     }
   }
 
-
+  function onDownloadNdkForRealz(link) {
-  function onDownloadForRealz(link) {
     if ($("input#agree").is(':checked')) {
-      $("div.sdk-terms").slideUp();
+      $("#tos").fadeOut('slow');
-      $("h2#tos-header").text('Now downloading...');
+
-      $(".sdk-terms-intro").text('Your download is in progress.');
+      $('html, body').animate({
-      $("#sdk-terms-form").fadeOut('slow', function() {
+          scrollTop: $("#Installing").offset().top
-        setTimeout(function() {
+        }, 800, function() {
-          // close the dialog
+          $("#Installing").click();
-          $('#ndk_tos').trigger('modal-close');
-          // reload to refresh the tos or optionally forward the user
-           location.reload();
-        }, 3000);
       });
-      ga('send', 'event', 'SDK', 'NDK tools', $("#downloadForRealz").html());
+
       return true;
     } else {
+      $("label#agreeLabel").parent().stop().animate({color: "#258AAF"}, 200,
+        function() {$("label#agreeLabel").parent().stop().animate({color: "#222"}, 200)}
+      );
       return false;
     }
   }
 
-
   $(window).hashchange( function(){
     if (location.hash == "") {
       location.reload();
@@ -256,173 +262,155 @@
 <?cs call:tag_list(root.descr) ?>
 
 
-<section id="downloads" class="dac-section dac-small">
-<div class="wrap">
-
-<h2 class="norule">Start using Android Studio today</h2>
-
-<p>Android Studio includes all the tools you need to build apps for Android.</p>
-
-<div style="float:left;margin-right:40px;width:auto;">
-<p>
-  <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>
-
-<div style="float:left;width:auto;margin-bottom:40px">
-<ul class="nolist" style="text-transform: uppercase;margin:8px 0">
-<li>Version: <?cs var:studio.version ?></li>
-<li>Release date: <?cs var:studio.release.date ?></li>
-</ul>
-</div>
 
 
+<div class="pax col-13 online" style="margin:0;">
 
-<h4 style="clear:left;margin-top:40px">Select a different platform</h4>
+
+<h3>SDK Tools Only</h3>
+
+<p>If you prefer to use a different IDE or run the tools from the
+command line or with build scripts, you can instead download the stand-alone Android SDK Tools.
+These packages provide the basic SDK tools for app development, without an IDE.
+Also see the <a href="<?cs var:toroot ?>tools/sdk/tools-notes.html">SDK tools release notes</a>.</p>
 
   <table class="download">
     <tr>
       <th>Platform</th>
-      <th>Android Studio package</th>
+      <th>Package</th>
       <th>Size</th>
-      <th>SHA-1 checksum</th>
+      <th>SHA-1 Checksum</th>
   </tr>
   <tr>
-    <td rowspan="3">Windows</td>
+    <td rowspan="2">Windows</td>
     <td>
-  <a onclick="return onDownload(this,false,true)" id="win-bundle" data-modal-toggle="studio_tos"
+  <a onclick="return onDownload(this)" id="win-tools" href="http://dl.google.com/android/<?cs
-    href="https://dl.google.com/dl/android/studio/install/<?cs var:studio.version ?>/<?cs var:studio.win_bundle_exe_download ?>"
+var:sdk.win_installer
-    ><?cs var:studio.win_bundle_exe_download ?></a><br>
+?>"><?cs var:sdk.win_installer ?></a> (Recommended)
-    Includes Windows installer (recommended)
     </td>
-    <td id="win-bundle-size"><?cs call:size_in_mb(studio.win_bundle_exe_bytes) ?> MB
+    <td><?cs var:sdk.win_installer_bytes ?> bytes</td>
-      <br>(<?cs var:studio.win_bundle_exe_bytes ?> bytes)</td>
+    <td><?cs var:sdk.win_installer_checksum ?></td>
-    <td><?cs var:studio.win_bundle_exe_checksum ?></td>
   </tr>
   <tr>
     <!-- blank TD from Windows rowspan -->
     <td>
-  <a onclick="return onDownload(this,false,true)" id="win-bundle-zip" data-modal-toggle="studio_tos"
+  <a onclick="return onDownload(this)" href="http://dl.google.com/android/<?cs var:sdk.win_download
-    href="https://dl.google.com/dl/android/studio/ide-zips/<?cs var:studio.version ?>/<?cs var:studio.win_bundle_download ?>"
+?>"><?cs var:sdk.win_download ?></a>
-    ><?cs var:studio.win_bundle_download ?></a><br>
-    No Windows installer
     </td>
-    <td><?cs call:size_in_mb(studio.win_bundle_bytes) ?> MB
+    <td><?cs var:sdk.win_bytes ?> bytes</td>
-      <br>(<?cs var:studio.win_bundle_bytes ?> bytes)</td>
+    <td><?cs var:sdk.win_checksum ?></td>
-    <td><?cs var:studio.win_bundle_checksum ?></td>
-  </tr>
-  <tr>
-    <!-- blank TD from Windows rowspan -->
-    <td>
-  <a onclick="return onDownload(this,false,true)" id="win-bundle-notools" data-modal-toggle="studio_tos"
-    href="https://dl.google.com/dl/android/studio/install/<?cs var:studio.version ?>/<?cs var:studio.win_notools_exe_download ?>"
-    ><?cs var:studio.win_notools_exe_download ?></a><br>
-    Includes Windows installer but no SDK tools
-    </td>
-    <td><?cs call:size_in_mb(studio.win_notools_exe_bytes) ?> MB
-      <br>(<?cs var:studio.win_notools_exe_bytes ?> bytes)</td>
-    <td><?cs var:studio.win_notools_exe_checksum ?></td>
   </tr>
   <tr>
     <td><nobr>Mac OS X</nobr></td>
     <td>
-  <a onclick="return onDownload(this,false,true)" id="mac-bundle" data-modal-toggle="studio_tos"
+  <a onclick="return onDownload(this)" id="mac-tools" href="http://dl.google.com/android/<?cs
-    href="https://dl.google.com/dl/android/studio/install/<?cs var:studio.version ?>/<?cs var:studio.mac_bundle_download ?>"
+var:sdk.mac_download
-    ><?cs var:studio.mac_bundle_download ?></a>
+?>"><?cs var:sdk.mac_download ?></a>
     </td>
-    <td id="mac-bundle-size"><?cs call:size_in_mb(studio.mac_bundle_bytes) ?> MB
+    <td><?cs var:sdk.mac_bytes ?> bytes</td>
-      <br>(<?cs var:studio.mac_bundle_bytes ?> bytes)</td>
+    <td><?cs var:sdk.mac_checksum ?></td>
-    <td><?cs var:studio.mac_bundle_checksum ?></td>
   </tr>
   <tr>
     <td>Linux</td>
     <td>
-  <a onclick="return onDownload(this,false,true)" id="linux-bundle" data-modal-toggle="studio_tos"
+  <a onclick="return onDownload(this)" id="linux-tools" href="http://dl.google.com/android/<?cs
+var:sdk.linux_download
+?>"><?cs var:sdk.linux_download ?></a>
+    </td>
+    <td><?cs var:sdk.linux_bytes ?> bytes</td>
+    <td><?cs var:sdk.linux_checksum ?></td>
+  </tr>
+  </table>
+
+
+
+<h3>All Android Studio Packages</h3>
+
+<p>Select a specific Android Studio package for your platform. Also see the
+<a href="<?cs var:toroot ?>tools/revisions/studio.html">Android Studio release notes</a>.</p>
+
+  <table class="download">
+    <tr>
+      <th>Platform</th>
+      <th>Package</th>
+      <th>Size</th>
+      <th>SHA-1 Checksum</th>
+  </tr>
+
+  <tr>
+    <td rowspan="3">Windows</td>
+    <td>
+  <a onclick="return onDownload(this)" id="win-bundle"
+    href="https://dl.google.com/dl/android/studio/install/<?cs var:studio.version ?>/<?cs var:studio.win_bundle_exe_download ?>"
+    ><?cs var:studio.win_bundle_exe_download ?></a><br>(Recommended)
+    </td>
+    <td><?cs var:studio.win_bundle_exe_bytes ?> bytes</td>
+    <td><?cs var:studio.win_bundle_exe_checksum ?></td>
+  </tr>
+
+  <tr>
+    <!-- blank TD from Windows rowspan -->
+    <td>
+  <a onclick="return onDownload(this)"
+    href="https://dl.google.com/dl/android/studio/install/<?cs var:studio.version ?>/<?cs var:studio.win_notools_exe_download ?>"
+    ><?cs var:studio.win_notools_exe_download ?></a><br>(No SDK tools included)
+    </td>
+    <td><?cs var:studio.win_notools_exe_bytes ?> bytes</td>
+    <td><?cs var:studio.win_notools_exe_checksum ?></td>
+  </tr>
+
+  <tr>
+    <!-- blank TD from Windows rowspan -->
+    <td>
+  <a onclick="return onDownload(this)"
+    href="https://dl.google.com/dl/android/studio/ide-zips/<?cs var:studio.version ?>/<?cs var:studio.win_bundle_download ?>"
+    ><?cs var:studio.win_bundle_download ?></a>
+    </td>
+    <td><?cs var:studio.win_bundle_bytes ?> bytes</td>
+    <td><?cs var:studio.win_bundle_checksum ?></td>
+  </tr>
+
+  <tr>
+    <td><nobr>Mac OS X</nobr></td>
+    <td>
+  <a onclick="return onDownload(this)" id="mac-bundle"
+    href="https://dl.google.com/dl/android/studio/install/<?cs var:studio.version ?>/<?cs var:studio.mac_bundle_download ?>"
+    ><?cs var:studio.mac_bundle_download ?></a>
+    </td>
+    <td><?cs var:studio.mac_bundle_bytes ?> bytes</td>
+    <td><?cs var:studio.mac_bundle_checksum ?></td>
+  </tr>
+
+  <tr>
+    <td>Linux</td>
+    <td>
+  <a onclick="return onDownload(this)" id="linux-bundle"
     href="https://dl.google.com/dl/android/studio/ide-zips/<?cs var:studio.version ?>/<?cs var:studio.linux_bundle_download ?>"
     ><?cs var:studio.linux_bundle_download ?></a>
     </td>
-    <td id="linux-bundle-size"><?cs call:size_in_mb(studio.linux_bundle_bytes) ?> MB
+    <td><?cs var:studio.linux_bundle_bytes ?> bytes</td>
-      <br>(<?cs var:studio.linux_bundle_bytes ?> bytes)</td>
     <td><?cs var:studio.linux_bundle_checksum ?></td>
   </tr>
   </table>
 
 
 
-<h4 class="norule" style="margin-top:40px">Get just the SDK tools</h4>
+</div><!-- end pax -->
-
+
-<p>If you do not need Android Studio, you can download the basic
+
-Android SDK tools below.</p>
+
-
+</div><!-- end col-13 for lower-half content -->
-  <table class="download">
+
-    <tr>
+
-      <th>Platform</th>
-      <th>SDK tools package</th>
-      <th>Size</th>
-      <th>SHA-1 checksum</th>
-  </tr>
-  <tr>
-    <td rowspan="2">Windows</td>
-    <td>
-  <a onclick="return onDownload(this)" id="win-tools" data-modal-toggle="studio_tos"
-    href="//dl.google.com/android/<?cs
-var:sdk.win_installer
-?>"><?cs var:sdk.win_installer ?></a><br>
-    Includes Windows installer
-    </td>
-    <td><?cs call:size_in_mb(sdk.win_installer_bytes) ?> MB
-      <br>(<?cs var:sdk.win_installer_bytes ?> bytes)</td>
-    <td><?cs var:sdk.win_installer_checksum ?></td>
-  </tr>
-  <tr>
-    <!-- blank TD from Windows rowspan -->
-    <td>
-  <a onclick="return onDownload(this)" id="win-tools2" data-modal-toggle="studio_tos"
-    href="//dl.google.com/android/<?cs var:sdk.win_download
-?>"><?cs var:sdk.win_download ?></a><br>
-    No Windows installer
-    </td>
-    <td><?cs call:size_in_mb(sdk.win_bytes) ?> MB
-      <br>(<?cs var:sdk.win_bytes ?> bytes)</td>
-    <td><?cs var:sdk.win_checksum ?></td>
-  </tr>
-  <tr>
-    <td><nobr>Mac OS X</nobr></td>
-    <td>
-  <a onclick="return onDownload(this)" id="mac-tools" data-modal-toggle="studio_tos"
-    href="//dl.google.com/android/<?cs
-var:sdk.mac_download
-?>"><?cs var:sdk.mac_download ?></a>
-    </td>
-    <td><?cs call:size_in_mb(sdk.mac_bytes) ?> MB
-      <br>(<?cs var:sdk.mac_bytes ?> bytes)</td>
-    <td><?cs var:sdk.mac_checksum ?></td>
-  </tr>
-  <tr>
-    <td>Linux</td>
-    <td>
-  <a onclick="return onDownload(this)" id="linux-tools" data-modal-toggle="studio_tos"
-    href="//dl.google.com/android/<?cs
-var:sdk.linux_download
-?>"><?cs var:sdk.linux_download ?></a>
-    </td>
-    <td><?cs call:size_in_mb(sdk.linux_bytes) ?> MB
-      <br>(<?cs var:sdk.linux_bytes ?> bytes)</td>
-    <td><?cs var:sdk.linux_checksum ?></td>
-  </tr>
-  </table>
-  <p>
-Also see the <a href="<?cs var:toroot ?>tools/sdk/tools-notes.html">SDK
-tools release notes</a>.</p>
-
-  </div><!-- end wrap -->
-  </section>
 
 
-<?cs ########  The Android Studio version of the download script ######### ?>
 <script>
+  if (location.hash == "#Requirements") {
+    $('.reqs').show();
+  } else if (location.hash == "#ExistingIDE") {
+	 $('.ide').show();
+  }
+
   var os;
   var bundlename;
   var $toolslink;
@@ -447,9 +435,7 @@ tools release notes</a>.</p>
     $('#not-supported').hide();
 
     /* set up primary Android Studio download button */
-    idname = bundlename + "-size";
+    $('.download-bundle-button').append(" <br/><span class='small'>for " + os + "</span>");
-    sizeMB = $(idname).text().split(' MB')[0];
-    $('.download-bundle-button > .small').html(" for " + os + " <em>(" + sizeMB + " MB)</em>");
     $('.download-bundle-button').click(function() {return onDownload(this,true,true);}).attr('href', bundlename);
   }
 
@@ -464,13 +450,12 @@ tools release notes</a>.</p>
     }
 
     $("#downloadForRealz").attr('bundle', bundle);
-    if (bundle && !button) {
+    $("a#downloadForRealz").attr("name", $(link).attr('href'));
-      $("a#downloadForRealz").attr("name", "#" + $(link).attr('id'));
-    } else {
-      $("h2#tos-header").text('Download the Android SDK Tools');
-      $("a#downloadForRealz").attr("name", $(link).attr('href'));
-    }
 
+    $("#tos").show();
+    $("#landing").hide();
+
+    location.hash = "top";
     return false;
   }
 
@@ -498,27 +483,28 @@ tools release notes</a>.</p>
 
   function onDownloadForRealz(link) {
     if ($("input#agree").is(':checked')) {
+      location.hash = "";
+      location.hash = "top";
       $("div.sdk-terms").slideUp();
-      if ($("#downloadForRealz").attr('bundle') == 'true') {
+      $("h1#tos-header").text('Now downloading...');
-        $("h2#tos-header").text('Now downloading Android Studio!');
+      $(".sdk-terms-intro").text('You\'ll be redirected to the install instructions in a moment.');
-        $(".sdk-terms-intro").text('Redirecting to the install instructions...');
+      $("#sdk-terms-form").fadeOut('slow', function() {
-        $("#sdk-terms-form").slideUp(function() {
+        setTimeout(function() {
-          setTimeout(function() {
+          if ($("#downloadForRealz").attr('bundle') == 'true') {
-            window.location = "/sdk/installing/index.html";
+            // User downloaded the studio Bundle
-          }, 2000);
+            window.location = "/sdk/installing/index.html?pkg=studio";
-        });
+          } else {
-      } else {
+            // User downloaded the SDK Tools
-        $("h2#tos-header").text('Now downloading the Android SDK Tools!');
+            window.location = "/sdk/installing/index.html?pkg=tools";
-        $(".sdk-terms-intro").html("<p>Because you've chosen to download " +
+          }
-          "only the Android SDK tools (and not Android Studio), there are no " +
+        }, 3000);
-          "setup procedures to follow.</p><p>For information about how to " +
+      });
-          "keep your SDK tools up to date, refer to the " +
-          "<a href='/tools/help/sdk-manager.html'>SDK Manager</a> guide.</p>");
-        $("#sdk-terms-form").slideUp();
-      }
       ga('send', 'event', 'SDK', 'IDE and Tools', $("#downloadForRealz").html());
       return true;
     } else {
+      $("label#agreeLabel").parent().stop().animate({color: "#258AAF"}, 200,
+        function() {$("label#agreeLabel").parent().stop().animate({color: "#222"}, 200)}
+      );
       return false;
     }
   }
@@ -533,7 +519,7 @@ tools release notes</a>.</p>
 
 
 
-
+</div><!-- end the wrapper used for relative/absolute positions  -->
 <?cs # THIS DIV WAS OPENED IN INDEX.JD ?>
 
 
@@ -582,11 +568,6 @@ tools release notes</a>.</p>
 </div><!-- end g-unit -->
 
 <?cs include:"trailer.cs" ?>
-<script src="https://developer.android.com/ytblogger_lists_unified.js?v=17" type="text/javascript"></script>
-<script src="/jd_lists_unified.js?v=17" type="text/javascript"></script>
-<script src="/jd_extras.js?v=17" type="text/javascript"></script>
-<script src="/jd_collections.js?v=17" type="text/javascript"></script>
-<script src="/jd_tag_helpers.js?v=17" type="text/javascript"></script>
 
 <!-- Start of Tag -->
 <script type="text/javascript">

tools/droiddoc/templates-sdk-dev/trailer.cs

@@ -1,7 +1,3 @@
-<?cs
-# Other, non-visible things needed at the end of the page,
-# because not every page needs footer content, but does need other stuff
-?>
 </div> <!-- end body-content --> <?cs # normally opened by header.cs ?>
 
 <?cs if:carousel ?>
@@ -22,17 +18,3 @@ $(".feed").dacTabbedList({
 </script>
 <?cs /if ?>
 
-<script src="https://developer.android.com/ytblogger_lists_unified.js" defer></script>
-<script src="/jd_lists_unified_en.js?v=17" defer></script>
-<script src="/reference/lists.js?v=17" defer></script>
-<script src="/reference/gcm_lists.js?v=17" defer></script>
-<script src="/reference/gms_lists.js?v=17" defer></script>
-<script>
-  // Load localized metadata.
-  (function(lang) {
-    if (lang === 'en') { return; }
-
-    // Write it to the document so it gets evaluated before DOMContentReady.
-    document.write('<script src="/jd_lists_unified_' + lang + '.js?v=14" defer></' + 'script>');
-  })(getLangPref())
-</script>

tools/droiddoc/templates-sdk-refonly/assets/GPL-LICENSE.txt

@@ -1,278 +0,0 @@
-       GNU GENERAL PUBLIC LICENSE
-           Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-          Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-        GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-          NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.

tools/droiddoc/templates-sdk-refonly/assets/LICENSE.txt

@@ -1,20 +0,0 @@
-Copyright (c) 2011 John Resig, http://jquery.com/
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

tools/droiddoc/templates-sdk-refonly/assets/css/fullscreen.css

@@ -1,20 +0,0 @@
-
-/* =============================================================================
-   Columns
-   ========================================================================== */
-/* Applied to body to debug layout alignments
-.grid {
-  width:100%;
-  height:100%;
-  background:url(../images/grid.png) center repeat-y;
-  top:0px;
-  margin:auto;
-  position:absolute;
-}   
-*/
-
-@media screen, projection, print {
-  .wrap {
-    max-width: none;
-  }
-}

tools/droiddoc/templates-sdk-refonly/assets/design/default.js

@@ -1,188 +0,0 @@
-$(document).ready(function() {
-  // prep nav expandos
-  var pagePath = document.location.pathname;
-  if (pagePath.indexOf(SITE_ROOT) == 0) {
-    pagePath = pagePath.substr(SITE_ROOT.length);
-    if (pagePath == '' || pagePath.charAt(pagePath.length - 1) == '/') {
-      pagePath += 'index.html';
-    }
-  }
-
-  if (SITE_ROOT.match(/\.\.\//) || SITE_ROOT == '') {
-    // If running locally, SITE_ROOT will be a relative path, so account for that by
-    // finding the relative URL to this page. This will allow us to find links on the page
-    // leading back to this page.
-    var pathParts = pagePath.split('/');
-    var relativePagePathParts = [];
-    var upDirs = (SITE_ROOT.match(/(\.\.\/)+/) || [''])[0].length / 3;
-    for (var i = 0; i < upDirs; i++) {
-      relativePagePathParts.push('..');
-    }
-    for (var i = 0; i < upDirs; i++) {
-      relativePagePathParts.push(pathParts[pathParts.length - (upDirs - i) - 1]);
-    }
-    relativePagePathParts.push(pathParts[pathParts.length - 1]);
-    pagePath = relativePagePathParts.join('/');
-  } else {
-    // Otherwise the page path should be an absolute URL.
-    pagePath = SITE_ROOT + pagePath;
-  }
-
-  // select current page in sidenav and set up prev/next links if they exist
-  var $selNavLink = $('.nav-y').find('a[href="' + pagePath + '"]');
-  if ($selNavLink.length) {
-    $selListItem = $selNavLink.closest('li');
-
-    $selListItem.addClass('selected');
-    $selListItem.closest('li>ul').addClass('expanded');
-
-    // set up prev links
-    var $prevLink = [];
-    var $prevListItem = $selListItem.prev('li');
-    if ($prevListItem.length) {
-      if ($prevListItem.hasClass('nav-section')) {
-        // jump to last topic of previous section
-        $prevLink = $prevListItem.find('a:last');
-      } else {
-        // jump to previous topic in this section
-        $prevLink = $prevListItem.find('a:eq(0)');
-      }
-    } else {
-      // jump to this section's index page (if it exists)
-      $prevLink = $selListItem.parents('li').find('a');
-    }
-
-    if ($prevLink.length) {
-      var prevHref = $prevLink.attr('href');
-      if (prevHref == SITE_ROOT + 'index.html') {
-        // Don't show Previous when it leads to the homepage
-        $('.prev-page-link').hide();
-      } else {
-        $('.prev-page-link').attr('href', prevHref).show();
-      }
-    } else {
-      $('.prev-page-link').hide();
-    }
-
-    // set up next links
-    var $nextLink = [];
-    if ($selListItem.hasClass('nav-section')) {
-      // we're on an index page, jump to the first topic
-      $nextLink = $selListItem.find('ul').find('a:eq(0)')
-    } else {
-      // jump to the next topic in this section (if it exists)
-      $nextLink = $selListItem.next('li').find('a:eq(0)');
-      if (!$nextLink.length) {
-        // no more topics in this section, jump to the first topic in the next section
-        $nextLink = $selListItem.parents('li').next('li.nav-section').find('a:eq(0)');
-      }
-    }
-    if ($nextLink.length) {
-      $('.next-page-link').attr('href', $nextLink.attr('href')).show();
-    } else {
-      $('.next-page-link').hide();
-    }
-  }
-
-  // Set up expand/collapse behavior
-  $('.nav-y li').has('ul').click(function() {
-    if ($(this).hasClass('expanded')) {
-      return;
-    }
-
-    // hide other
-    var $old = $('.nav-y li.expanded');
-    if ($old.length) {
-      var $oldUl = $old.children('ul');
-      $oldUl.css('height', $oldUl.height() + 'px');
-      window.setTimeout(function() {
-        $oldUl
-            .addClass('animate-height')
-            .css('height', '');
-      }, 0);
-      $old.removeClass('expanded');
-    }
-
-    // show me
-    $(this).addClass('expanded');
-    var $ul = $(this).children('ul');
-    var expandedHeight = $ul.height();
-    $ul
-        .removeClass('animate-height')
-        .css('height', 0);
-    window.setTimeout(function() {
-      $ul
-          .addClass('animate-height')
-          .css('height', expandedHeight + 'px');
-    }, 0);
-  });
-
-  // Stop expand/collapse behavior when clicking on nav section links (since we're navigating away
-  // from the page)
-  $('.nav-y li').has('ul').find('a:eq(0)').click(function(evt) {
-    window.location.href = $(this).attr('href');
-    return false;
-  });
-
-  // Set up play-on-hover <video> tags.
-  $('video.play-on-hover').bind('click', function(){
-    $(this).get(0).load(); // in case the video isn't seekable
-    $(this).get(0).play();
-  });
-
-  // Set up tooltips
-  var TOOLTIP_MARGIN = 10;
-  $('acronym').each(function() {
-    var $target = $(this);
-    var $tooltip = $('<div>')
-        .addClass('tooltip-box')
-        .text($target.attr('title'))
-        .hide()
-        .appendTo('body');
-    $target.removeAttr('title');
-
-    $target.hover(function() {
-      // in
-      var targetRect = $target.offset();
-      targetRect.width = $target.width();
-      targetRect.height = $target.height();
-
-      $tooltip.css({
-        left: targetRect.left,
-        top: targetRect.top + targetRect.height + TOOLTIP_MARGIN
-      });
-      $tooltip.addClass('below');
-      $tooltip.show();
-    }, function() {
-      // out
-      $tooltip.hide();
-    });
-  });
-
-  // Set up <h2> deeplinks
-  $('h2').click(function() {
-    var id = $(this).attr('id');
-    if (id) {
-      document.location.hash = id;
-    }
-  });
-
-  // Set up fixed navbar
-  var navBarIsFixed = false;
-  $(window).scroll(function() {
-    var scrollTop = $(window).scrollTop();
-    var navBarShouldBeFixed = (scrollTop > (100 - 40));
-    if (navBarIsFixed != navBarShouldBeFixed) {
-      if (navBarShouldBeFixed) {
-        $('#nav')
-            .addClass('fixed')
-            .prependTo('#page-container');
-      } else {
-        $('#nav')
-            .removeClass('fixed')
-            .prependTo('#nav-container');
-      }
-      navBarIsFixed = navBarShouldBeFixed;
-    }
-  });
-});