Merge "Doc change: updates for preview content." into mnc-preview-docs

docs/html-ndk/ndk/index.jd

@@ -43,9 +43,10 @@ footer.hide=1
 <section class="dac-section dac-gray dac-small dac-invert" id="latest"><div class="wrap">
   <h2 class="norule">Latest</h2>
   <div class="resource-widget resource-flow-layout col-16"
-       data-query="type:blog+tag:featured+tag:preview"
+       data-query="type:blog+tag:ndk"
        data-cardSizes="6x6"
-       data-maxResults="3"></div>
+       data-maxResults="6"
+       data-initial-results="3"></div>
 </div></section>
 
 <section class="dac-section dac-light"><div class="wrap">

docs/html/develop/index.jd

@@ -58,7 +58,8 @@ excludeFromSuggestions=true
   <div class="resource-widget resource-flow-layout col-16"
        data-query="collection:develop/landing/latest"
        data-cardSizes="6x6"
-       data-maxResults="3"></div>
+       data-maxResults="9"
+       data-initial-results="3"></div>
 </div></section>
 
 <section class="dac-section dac-light"><div class="wrap">
@@ -125,5 +126,6 @@ excludeFromSuggestions=true
        data-query="collection:develop/landing/courses"
        data-sortOrder="random"
        data-cardSizes="6x6"
-       data-maxResults="6"></div>
+       data-initial-results="6"
+       data-maxResults="12"></div>
 </div></section>

docs/html/distribute/googleplay/cast.jd

@@ -1,4 +1,4 @@
-page.title=Stream with Google Cast
+page.title=Stream Your Content with Google Cast
 page.metaDescription=Let users stream your video and audio content to their TVs and speakers.
 page.tags=cast, video, chromecast
 @jd:body

docs/html/distribute/index.jd

@@ -22,7 +22,8 @@ page.metaDescription=The most visited store in the world for Android apps. Cloud
       data-query="type:youtube+tag:googleplay+tag:developerstory+tag:featured, type:blog+tag:googleplay+tag:distribute+tag:featured"
       data-sortOrder="-timestamp"
       data-cardSizes="6x6"
-      data-maxResults="3"></div>
+      data-maxResults="12"
+      data-initial-results="3"></div>
 </div></section>
 
 <section class="dac-section dac-invert dac-darken-bg" style="background-image: url(/images/distribute/google-play-bg.jpg)"><div class="wrap">

docs/html/google/index.jd

@@ -11,7 +11,7 @@ footer.hide=1
   <div class="wrap">
     <div class="cols dac-hero-content">
       <div class="col-1of2 col-push-1of2 dac-hero-figure">
-        <img class="dac-hero-image" src="/design/media/hero-material-design.png">
+        <img class="dac-hero-image" src="/images/google/hero-play-services_2x.png">
       </div>
       <div class="col-1of2 col-pull-1of2">
         <h1 class="dac-hero-title">Build better apps with Google</h1>
@@ -44,7 +44,8 @@ footer.hide=1
   <div class="resource-widget resource-flow-layout col-16"
        data-query="type:blog+tag:googleservices+tag:featured+tag:develop"
        data-cardSizes="6x6"
-       data-maxResults="3"></div>
+       data-maxResults="9"
+       data-initial-results="3"></div>
   </div>
 </section>
 

docs/html/index.jd

@@ -7,9 +7,11 @@ page.customHeadTag=<meta name="google-site-verification" content="sa-bIAI6GKvct3
 
 <!-- <div class="dac-hero-carousel" data-carousel-query="collection:index/carousel">
 </div> -->
+<section class="dac-hero-carousel">
 
-<article class="dac-expand dac-hero dac-invert active" style="background-color: rgb(38, 50, 56);">
-<a class="dac-hero-carousel-action" href="{@docRoot}preview/index.html">
+<!-- <article class="dac-expand dac-hero dac-invert active" style="background-color: rgb(38, 50, 56);"> -->
+<article class="dac-expand dac-hero dac-invert active" style="background-color: #455A64;">
+<a href="/preview/index.html">
   <div class="wrap" style="max-width:1100px;">
     <div class="cols dac-hero-content">
       <div class="col-10of16 col-push-6of16 dac-hero-figure">
@@ -30,7 +32,7 @@ page.customHeadTag=<meta name="google-site-verification" content="sa-bIAI6GKvct3
     </div>
   </div>
 </a>
-</article>
+</article></section>
 
 <div class="actions-bar dac-expand dac-invert">
   <div class="wrap dac-offset-parent">

docs/html/jd_collections.js

@@ -1383,11 +1383,15 @@ var RESOURCE_COLLECTIONS = {
     "title": "",
     "resources": [
       "preview/overview.html",
-      "preview/api-overview.html",
+      "preview/download.html",
       "preview/setup-sdk.html",
       "preview/samples.html",
-      "preview/reference.html",
-      "preview/support.html"
+      "preview/support.html",
+      "preview/api-overview.html",
+      "preview/features/runtime-permissions.html",
+      "preview/api-changes.html",
+      "preview/api-overview.html",
+      "preview/backup/index.html",
     ]
   },
   "autolanding": {

docs/html/jd_extras.js

@@ -2623,7 +2623,7 @@ DISTRIBUTE_RESOURCES = DISTRIBUTE_RESOURCES.concat([
     "group":"",
     "keywords": ["mobile","ux","design"],
     "tags": ["courses"],
-    "image":"images/cards/course-ud849.jpg",
+    "image":"images/cards/course-ud849_2x.jpg",
     "lang":"en",
     "type":"online course"
   },
@@ -2635,7 +2635,7 @@ DISTRIBUTE_RESOURCES = DISTRIBUTE_RESOURCES.concat([
     "group":"",
     "keywords": ["start","firstapp","sdk"],
     "tags": ["courses"],
-    "image":"images/cards/course-ud853.jpg",
+    "image":"images/cards/course-ud853_2x.jpg",
     "lang":"en",
     "type":"online course"
   },
@@ -2647,19 +2647,19 @@ DISTRIBUTE_RESOURCES = DISTRIBUTE_RESOURCES.concat([
     "group":"",
     "keywords": ["performance","battery"],
     "tags": ["courses"],
-    "image":"images/cards/course-ud825.png",
+    "image":"images/cards/course-ud825_2x.png",
     "lang":"en",
     "type":"online course"
   },
   {
     "title":"Enroll in the Android Nanodegree",
     "titleFriendly":"",
-    "summary":"Sign up to learn about Android and receive a certification of your efforts.",
-    "url":"https://www.udacity.com/android-nanodegree",
+    "summary":"Enroll in the Android Nanodegree to build the skills to work as an Android developer.",
+    "url":"https://www.udacity.com/android",
     "group":"",
     "keywords": ["nanodegree"],
     "tags": ["courses"],
-    "image":"images/cards/course-nanodegree-lg.jpg",
+    "image":"images/cards/course-nanodegree_2x.png",
     "lang":"en",
     "type":"online course"
   },
@@ -2671,7 +2671,7 @@ DISTRIBUTE_RESOURCES = DISTRIBUTE_RESOURCES.concat([
     "group":"",
     "keywords": ["android, experts"],
     "tags": ["courses"],
-    "image":"images/cards/course-ud855.jpg",
+    "image":"images/cards/course-ud855_2x.jpg",
     "lang":"en",
     "type":"online course"
   },
@@ -2683,7 +2683,7 @@ DISTRIBUTE_RESOURCES = DISTRIBUTE_RESOURCES.concat([
     "group":"",
     "keywords": ["wear, tv, auto"],
     "tags": ["courses"],
-    "image":"images/cards/course-ud875.jpg",
+    "image":"images/cards/course-ud875_2x.jpg",
     "lang":"en",
     "type":"online course"
   },
@@ -2695,7 +2695,7 @@ DISTRIBUTE_RESOURCES = DISTRIBUTE_RESOURCES.concat([
     "group":"",
     "keywords": ["google, play services, google services"],
     "tags": ["courses"],
-    "image":"images/cards/course-ud876.jpg",
+    "image":"images/cards/course-ud876_2x.jpg",
     "lang":"en",
     "type":"online course"
   },
@@ -2707,7 +2707,7 @@ DISTRIBUTE_RESOURCES = DISTRIBUTE_RESOURCES.concat([
     "group":"",
     "keywords": ["design, pure, material"],
     "tags": ["courses"],
-    "image":"images/cards/course-ud862.jpg",
+    "image":"images/cards/course-ud862_2x.jpg",
     "lang":"en",
     "type":"online course"
   },
@@ -2719,7 +2719,7 @@ DISTRIBUTE_RESOURCES = DISTRIBUTE_RESOURCES.concat([
     "group":"",
     "keywords": ["firstapp",],
     "tags": ["courses"],
-    "image":"images/cards/course-ud837.jpg",
+    "image":"images/cards/course-ud837_2x.jpg",
     "lang":"en",
     "type":"online course"
   },
@@ -2731,7 +2731,7 @@ DISTRIBUTE_RESOURCES = DISTRIBUTE_RESOURCES.concat([
     "group":"",
     "keywords": ["gradle","studio", "sdk"],
     "tags": ["courses"],
-    "image":"images/cards/course-ud867.jpg",
+    "image":"images/cards/course-ud867_2x.jpg",
     "lang":"en",
     "type":"online course"
   },

docs/html/preview/index.jd

@@ -7,45 +7,67 @@ header.hide=1
 footer.hide=1
 @jd:body
 
-<section class="dac-expand dac-hero dac-light" style="background-repeat:no-repeat">
-  <div class="wrap">
+<section class="dac-expand dac-hero dac-light" >
+  <div class="wrap" style="max-width:1100px">
     <div class="cols dac-hero-content">
       <div class="col-9of16 col-push-7of16 dac-hero-figure">
-        <img class="dac-hero-image" src="{@docRoot}images/home/devices-hero_620px_2x.png">
+        <img class="dac-hero-image" src="/images/home/devices-hero_620px_2x.png">
       </div>
-      <div class="col-7of16 col-pull-9of16">
+      <div class="col-6of16 col-pull-8of16">
         <h1 class="dac-hero-title">Android M Developer Preview</h1>
         <p class="dac-hero-description">
           Get ready for the next version of Android. Test your apps on Nexus 5, 6, 9, and
-          Player. Explore what's new &mdash; a runtime permissions model, power saving Volta features, and new assist technology.
+          Player. Explore what's new &mdash; a <strong>runtime permissions</strong> model,
+          power-saving <strong>Volta features</strong>, new <strong>assist technology</strong>,
+          and more.
         </p>
 
-        <a class="dac-hero-cta" href="{@docRoot}preview/overview.html">
+        <a class="dac-hero-cta" href="/preview/overview.html">
           <span class="dac-sprite dac-auto-chevron"></span>
           Get Started!
         </a><br>
       </div>
     </div>
 
-    <div class="dac-section dac-small">
-      <div class="resource-widget resource-flow-layout col-16"
-           data-query="collection:preview/landing/resources"
-           data-cardSizes="6x2"
-           data-maxResults="3"></div>
-    </div>
-  </div>
+
 </section>
 
+
 <div class="wrap dac-offset-parent">
   <a class="dac-fab dac-scroll-button" data-scroll-button href="#latest">
     <i class="dac-sprite dac-arrow-down-gray"></i>
   </a>
 </div>
 
+<section class="dac-section dac-gray dac-small dac-invert" id="latest"><div class="wrap">
+  <h2 class="norule">Resources</h2>
+<div class="dac-section dac-small">
+      <div class="resource-widget resource-flow-layout col-16"
+           data-query="collection:preview/landing/resources"
+           data-cardSizes="6x2"
+           data-maxResults="6"></div>
+    </div> 
+  </div></section>
+
+
+
+<section class="dac-section dac-section-light" id="build-apps"><div class="wrap">
+  <h1 class="dac-section-title">Get your apps ready</h1>
+  <div class="dac-section-subtitle">
+    Resources to help you learn about Android M and get your app ready.
+  </div>
+  <div class="resource-widget resource-flow-layout col-16"
+       data-query="collection:preview/landing/resources"
+       data-cardSizes="6x6"
+       data-maxResults="6"></div>
+</div></section>
+
+
 <section class="dac-section dac-gray dac-small dac-invert" id="latest"><div class="wrap">
   <h2 class="norule">Latest</h2>
   <div class="resource-widget resource-flow-layout col-16"
-       data-query="type:blog+tag:featured+tag:preview"
+       data-query="type:blog+tag:featured"
        data-cardSizes="6x6"
-       data-maxResults="3"></div>
+       data-maxResults="6"
+       data-initial-results="3"</div>
 </div></section>

docs/html/training/index.jd

@@ -15,8 +15,8 @@ Classes are organized into several groups you can see at the top-level of the le
 <div>
 <div style="float:left; width:40%; margin-right:30px">
 
-    <p>If you think you might prefer to learn the basics through interactive video training,
-    check out this trailer for a course in the fundamentals of Android development.</p>
+    <p>If you prefer to learn through interactive video training,
+    check out this trailer for a course about the fundamentals of Android development.</p>
     <p><a href="https://www.udacity.com/course/ud853" class="button">
     Start the video course</a></p>
 </div>
@@ -26,4 +26,16 @@ Classes are organized into several groups you can see at the top-level of the le
 </div>
 </div>
 
-<div style="clear:left"></div>
+<div style="clear:left"></div>
+
+  <div><h2 class="norule">Online video courses</h2>
+  <p>If you prefer to learn through interactive video training,
+    check out these free courses.</p>
+  <div class="resource-widget resource-flow-layout col-16"
+       data-query="collection:develop/landing/courses"
+       data-sortOrder="random"
+       data-cardSizes="6x6"
+       data-maxResults="9"
+       data-initial-results="3"></div>
+</div>
+</div>