am 85dea528: Doc change: updated images, landings, and ndk updates.

* commit '85dea528866217d4b3d40a1162c00c4e836504aa':
  Doc change: updated images, landings, and ndk updates.

diff --git a/Android.mk b/Android.mk
index 449ae1b..184392a 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -1010,7 +1010,7 @@ LOCAL_DROIDDOC_OPTIONS:= \
                -hdf android.hasSamples true \
                -samplesdir $(samples_dir)
 
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-ndk
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
 
 include $(BUILD_DROIDDOC)
 

diff --git a/docs/html-ndk/ndk/guides/guides_toc.cs b/docs/html-ndk/ndk/guides/guides_toc.cs
index e6bc199..bfb4ea9 100644 (file)
--- a/docs/html-ndk/ndk/guides/guides_toc.cs
+++ b/docs/html-ndk/ndk/guides/guides_toc.cs
@@ -6,10 +6,25 @@
        localized titles are added in the language order specified below.
 ?>
 
-
 <ul id="nav">
-  <li><a href="/ndk/guides/index.html"><span class="en">Getting Started</span></a></li>
-  <li><a href="/ndk/guides/pg_html/md_1__concepts__concepts.html">Concepts</a></li>
+
+  <li class="nav-section">
+    <div class="nav-section-header"><a href="/ndk/guides/index.html">
+            <span class="en">Getting Started</span></a>
+    </div>
+    <ul>
+      <li><a href="/ndk/guides/md_1__concepts__concepts.html">
+            <span class="en">Concepts</span>
+          </a></li>
+      <li><a href="<?cs var:toroot ?>ndk/index.html">
+            <span class="en">Device Compatibility</span>
+          </a></li>
+      <li><a href="<?cs var:toroot ?>ndk/index.html">
+          <span class="en">System Permissions</span>
+        </a>
+      </li>
+    </ul>
+  </li>
 </ul>
 
 

diff --git a/docs/html-ndk/ndk/index.jd b/docs/html-ndk/ndk/index.jd
index f1c5ce6..6723ed7 100644 (file)
--- a/docs/html-ndk/ndk/index.jd
+++ b/docs/html-ndk/ndk/index.jd
@@ -1,15 +1,68 @@
+page.title=Android NDK
+page.tags="ndk, native, c, c++", 
+meta.tags="ndk, native, c++"
 fullpage=true
-page.viewport_width=970
-excludeFromSuggestions=true
-page.metaDescription=The official Android NDK developer web site.
-page.customHeadTag=<meta name="google-site-verification" content="sa-bIAI6GKvct3f61-WpRguHq-aNjtF7xJjMTSi79as" />
-
+section.landing=true
+header.hide=1
+footer.hide=1
 @jd:body
 
+<section class="dac-expand dac-hero dac-dark dac-invert" style="background-repeat:no-repeat;">
+  <div class="wrap">
+    <div class="cols dac-hero-content" style="margin-top:32px">
+      <div class="col-7of16 cdol-push-1of16">
+        <h1 class="dac-hero-title">Android NDK</h1>
+        <p class="dac-hero-description">
+        The Android NDK is a toolset that lets you implement parts of your app using native code languages such as C and C++. For certain types of apps, this can help you reuse existing code libraries written in those languages.
+        </p>
+
+        <a class="dac-hero-cta" href="/ndk/guides/index.html">
+          <span class="dac-sprite dac-auto-chevron"></span>
+          Get Started
+        </a><br>
+      </div>
+      <div class="col-8of16 col-push-1of16" style="margin-top:48px">
+
+        <span style="color:#00e5ff;font-family:'Roboto Mono', monospace;font-weight:400">public class <span
+        style="color:#eee">MyActivity</span> extends Activity {<br>
+              <span style="color:#ccc">&nbsp;&nbsp;/**<br>
+                &nbsp;&nbsp;* Native method implemented in C/C++<br>
+                &nbsp;&nbsp;*/</span><br>
+                &nbsp;&nbsp;public <span style="color:#1DE9B6;font-weight:700">native</span> void <span style="color:#eee">computerFoo()</span>;<br>
+              }</span>
+      </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">Latest</h2>
+  <div class="resource-widget resource-flow-layout col-16"
+       data-query="type:blog+tag:featured+tag:preview"
+       data-cardSizes="6x6"
+       data-maxResults="3"></div>
+</div></section>
+
+<section class="dac-section dac-light"><div class="wrap">
+  <h1 class="dac-section-title">Something else</h1>
+  <div class="dac-section-subtitle">
+    Placeholder
+  </div>
 
-<h1>SUPER FANCY NDK LANDING PAGE<h1>
+  <ul class="dac-section-links">
+    <li class="dac-section-link"><a href="">
+      <span class="dac-sprite dac-auto-chevron"></span>
+      Overview and Usage
+    </a></li>
+    <li class="dac-section-link"><a href="/google/play/filters.html">
+      <span class="dac-sprite dac-auto-chevron"></span>
+      User Guide
+    </a></li>
 
-<p>Welcome to the placeholder text for the NDK. Here, you'll find all of the details you need to
-combine the power of native code with Android flexibility and compatibility. The documents here
-help you get started, introduce some key concepts that you should know when using the NDK, and then
-provide a variety of other information that you'll find helpful while developing your app.</p>
+  </ul>
+</div></section>

diff --git a/docs/html/develop/index.jd b/docs/html/develop/index.jd
index f516677..4ba0b09 100644 (file)
--- a/docs/html/develop/index.jd
+++ b/docs/html/develop/index.jd
@@ -9,7 +9,7 @@ tabbedList=1
 excludeFromSuggestions=true
 @jd:body
 
-    <section class="dac-expand dac-hero dac-blue">
+<section class="dac-expand dac-hero dac-section-light">
   <div class="wrap">
     <div class="cols dac-hero-content">
       <div class="col-1of2 col-push-1of2 dac-hero-figure">
@@ -25,7 +25,7 @@ excludeFromSuggestions=true
           <span class="dac-sprite dac-auto-chevron"></span>
           Set up Android Studio
         </a><br>
-        <a class="dac-hero-cta" href="{@docRoot}training/basics/firstapp/index.html">
+        <a class="dac-hero-cta" href="{@docRoot}training/basics/training/index.html">
           <span class="dac-sprite dac-auto-chevron"></span>
           Build your first app
         </a><br>
@@ -117,12 +117,13 @@ excludeFromSuggestions=true
   </ul>
 </div></section>
 
-<section class="dac-section dac-light"><div class="wrap">
+<section class="dac-section dac-light" id="courses"><div class="wrap">
   <h1 class="dac-section-title">Online Courses</h1>
   <div class="dac-section-subtitle">Free online courses from Android
     experts that bring you step-by-step to building your own apps.</div>
   <div class="resource-widget resource-flow-layout col-16"
        data-query="collection:develop/landing/courses"
+       data-sortOrder="random"
        data-cardSizes="6x6"
-       data-maxResults="3"></div>
+       data-maxResults="6"></div>
 </div></section>

diff --git a/docs/html/google/index.jd b/docs/html/google/index.jd
index 9df09e1..e7a5167 100644 (file)
--- a/docs/html/google/index.jd
+++ b/docs/html/google/index.jd
@@ -67,8 +67,8 @@ footer.hide=1
   </div>
 </section>
 
-<section class="dac-section dac-gray dac-small dac-invert" id="latest"><div class="wrap">
-  <h2 class="norule">Latest</h2>
+<section class="dac-section dac-gray dac-small dac-invert" id="videos"><div class="wrap">
+  <h2 class="norule">Videos</h2>
   <div class="resource-widget resource-flow-layout col-16"
        data-query="collection:google/landing/videos"
        data-cardSizes="6x6"

diff --git a/docs/html/guide/index.jd b/docs/html/guide/index.jd
index b27acbf..1c124aa 100644 (file)
--- a/docs/html/guide/index.jd
+++ b/docs/html/guide/index.jd
@@ -18,9 +18,9 @@ navigation provide details about how to build apps using Android's various APIs.
 the following fundamental concepts about the Android app framework:</p>
 
 
-<div class="landing-banner">
-
-<div class="col-6">
+<div class="wrap">
+  <div class="cols">
+    <div class="col-1of2">
 
 <h4>Apps provide multiple entry points</h4>
 
@@ -45,7 +45,7 @@ for an action that other apps may invoke.</p>
 </div>
 
 
-<div class="col-6">
+<div class="col-1of2">
 
 <h4>Apps adapt to different devices</h4>
 
@@ -69,7 +69,8 @@ that feature.</p>
 
 </div>
 
-</div><!-- end landing-banner -->
+</div>
+</div>
 
 
 

diff --git a/docs/html/images/cards/course-nanodegree-lg_2x.jpg b/docs/html/images/cards/course-nanodegree-lg_2x.jpg
new file mode 100644 (file)
index 0000000..c32769b
Binary files /dev/null and b/docs/html/images/cards/course-nanodegree-lg_2x.jpg differ

diff --git a/docs/html/images/cards/course-nanodegree_2x.jpg b/docs/html/images/cards/course-nanodegree_2x.jpg
new file mode 100644 (file)
index 0000000..db3702b
Binary files /dev/null and b/docs/html/images/cards/course-nanodegree_2x.jpg differ

diff --git a/docs/html/images/cards/course-ud837_2x.jpg b/docs/html/images/cards/course-ud837_2x.jpg
new file mode 100644 (file)
index 0000000..2dfcabf
Binary files /dev/null and b/docs/html/images/cards/course-ud837_2x.jpg differ

diff --git a/docs/html/images/cards/course-ud855_2x.jpg b/docs/html/images/cards/course-ud855_2x.jpg
new file mode 100644 (file)
index 0000000..bc9c3ee
Binary files /dev/null and b/docs/html/images/cards/course-ud855_2x.jpg differ

diff --git a/docs/html/images/cards/course-ud862_2x.jpg b/docs/html/images/cards/course-ud862_2x.jpg
new file mode 100644 (file)
index 0000000..d3e77ff
Binary files /dev/null and b/docs/html/images/cards/course-ud862_2x.jpg differ

diff --git a/docs/html/images/cards/course-ud867_2x.jpg b/docs/html/images/cards/course-ud867_2x.jpg
new file mode 100644 (file)
index 0000000..2467efb
Binary files /dev/null and b/docs/html/images/cards/course-ud867_2x.jpg differ

diff --git a/docs/html/images/cards/course-ud875_2x.jpg b/docs/html/images/cards/course-ud875_2x.jpg
new file mode 100644 (file)
index 0000000..b7fc8cc
Binary files /dev/null and b/docs/html/images/cards/course-ud875_2x.jpg differ

diff --git a/docs/html/images/cards/course-ud876_2x.jpg b/docs/html/images/cards/course-ud876_2x.jpg
new file mode 100644 (file)
index 0000000..5f27246
Binary files /dev/null and b/docs/html/images/cards/course-ud876_2x.jpg differ

diff --git a/docs/html/images/home/devices-hero_620px_2x.png b/docs/html/images/home/devices-hero_620px_2x.png
new file mode 100644 (file)
index 0000000..273706e
Binary files /dev/null and b/docs/html/images/home/devices-hero_620px_2x.png differ

diff --git a/docs/html/index.jd b/docs/html/index.jd
index c0a5b4b..70274eb 100644 (file)
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -5,8 +5,32 @@ page.customHeadTag=<meta name="google-site-verification" content="sa-bIAI6GKvct3
 
 @jd:body
 
-<div class="dac-hero-carousel" data-carousel-query="collection:index/carousel">
-</div>
+<!-- <div class="dac-hero-carousel" data-carousel-query="collection:index/carousel">
+</div> -->
+
+<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">
+  <div class="wrap" style="max-width:1100px;">
+    <div class="cols dac-hero-content">
+      <div class="col-10of16 col-push-6of16 dac-hero-figure">
+        <img src="{@docRoot}images/home/devices-hero_620px_2x.png">
+      </div>
+      <div class="col-6of16 col-pull-10of16">
+        <div class="dac-hero-tag"></div>
+
+        <h1 class="dac-hero-title">Android M Developer Preview</h1>
+        <p class="dac-hero-description">Get your apps ready for the next version
+        of Android. Test on Nexus 5, 6, 9, and Player. </p>
+
+        <a class="dac-hero-cta" href="{@docRoot}preview/index.html">
+          <span class="dac-sprite dac-auto-chevron"></span>
+          Learn more
+        </a>
+      </div>
+    </div>
+  </div>
+</a>
+</article>
 
 <div class="actions-bar dac-expand dac-invert">
   <div class="wrap dac-offset-parent">

diff --git a/docs/html/jd_collections.js b/docs/html/jd_collections.js
index 4950d97..421f87a 100644 (file)
--- a/docs/html/jd_collections.js
+++ b/docs/html/jd_collections.js
@@ -150,7 +150,14 @@ var RESOURCE_COLLECTIONS = {
     "resources": [
       "https://www.udacity.com/course/ux-design-for-mobile-developers--ud849",
       "https://www.udacity.com/course/developing-android-apps--ud853",
-      "https://www.udacity.com/course/android-performance--ud825"
+      "https://www.udacity.com/course/android-performance--ud825",
+      "https://www.udacity.com/android-nanodegree",
+      "https://www.udacity.com/course/advanced-android-app-development--ud855",
+      "https://www.udacity.com/course/android-ubiquitous-computing--ud875",
+      "https://www.udacity.com/course/google-play-services--ud876",
+      "https://www.udacity.com/course/android-design-for-developers--ud862",
+      "https://www.udacity.com/course/android-development-for-beginners--ud837",
+      "https://www.udacity.com/course/gradle-for-android-and-java--ud867"
     ]
   },
   "preview/landing/herolinks": {

diff --git a/docs/html/jd_extras.js b/docs/html/jd_extras.js
index f318668..6f6d31d 100644 (file)
--- a/docs/html/jd_extras.js
+++ b/docs/html/jd_extras.js
@@ -2652,6 +2652,90 @@ DISTRIBUTE_RESOURCES = DISTRIBUTE_RESOURCES.concat([
     "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",
+    "group":"",
+    "keywords": ["nanodegree"],
+    "tags": ["courses"],
+    "image":"images/cards/course-nanodegree-lg.jpg",
+    "lang":"en",
+    "type":"online course"
+  },
+  {
+    "title":"Advanced Android App Development",
+    "titleFriendly":"",
+    "summary":"Productionize and publish your apps.",
+    "url":"https://www.udacity.com/course/advanced-android-app-development--ud855",
+    "group":"",
+    "keywords": ["android, experts"],
+    "tags": ["courses"],
+    "image":"images/cards/course-ud855.jpg",
+    "lang":"en",
+    "type":"online course"
+  },
+  {
+    "title":"Android Ubiquitous Computing",
+    "titleFriendly":"",
+    "summary":"Extend your apps to Wear, TV, and Auto.",
+    "url":"https://www.udacity.com/course/android-ubiquitous-computing--ud875",
+    "group":"",
+    "keywords": ["wear, tv, auto"],
+    "tags": ["courses"],
+    "image":"images/cards/course-ud875.jpg",
+    "lang":"en",
+    "type":"online course"
+  },
+  {
+    "title":"Google Play Services",
+    "titleFriendly":"",
+    "summary":"Use Google APIs to improve your apps.",
+    "url":"https://www.udacity.com/course/google-play-services--ud876",
+    "group":"",
+    "keywords": ["google, play services, google services"],
+    "tags": ["courses"],
+    "image":"images/cards/course-ud876.jpg",
+    "lang":"en",
+    "type":"online course"
+  },
+  {
+    "title":"Android Design for Developers",
+    "titleFriendly":"",
+    "summary":"Learn how to make your apps material.",
+    "url":"https://www.udacity.com/course/android-design-for-developers--ud862",
+    "group":"",
+    "keywords": ["design, pure, material"],
+    "tags": ["courses"],
+    "image":"images/cards/course-ud862.jpg",
+    "lang":"en",
+    "type":"online course"
+  },
+  {
+    "title":"Android Development for Beginners",
+    "titleFriendly":"",
+    "summary":"Make your first Android app, even if you don't write code.",
+    "url":"https://www.udacity.com/course/android-development-for-beginners--ud837",
+    "group":"",
+    "keywords": ["firstapp",],
+    "tags": ["courses"],
+    "image":"images/cards/course-ud837.jpg",
+    "lang":"en",
+    "type":"online course"
+  },
+  {
+    "title":"Gradle for Android and Java",
+    "titleFriendly":"",
+    "summary":"Build better apps through automation",
+    "url":"https://www.udacity.com/course/gradle-for-android-and-java--ud867",
+    "group":"",
+    "keywords": ["gradle","studio", "sdk"],
+    "tags": ["courses"],
+    "image":"images/cards/course-ud867.jpg",
+    "lang":"en",
+    "type":"online course"
+  },
+  {
     "title":"Watch Faces for Android Wear",
     "titleFriendly":"",
     "summary":"Watch faces let you customize the most prominent UI feature of Android wearables. The API is simple enough for rapid development and flexible enough to build something awesome.",

diff --git a/docs/html/preview/index.jd b/docs/html/preview/index.jd
index 3b5fdbd..da7b5ea 100644 (file)
--- a/docs/html/preview/index.jd
+++ b/docs/html/preview/index.jd
@@ -1,32 +1,29 @@
-page.title=M Developer Preview
-page.tags=preview
-meta.tags="preview"
+page.title=Android M Developer Preview
+page.tags="preview", 
+meta.tags="preview, M preview"
 fullpage=true
-page.viewport_width=970
 section.landing=true
 header.hide=1
 footer.hide=1
 @jd:body
 
-<section class="dac-expand dac-hero dac-light">
+<section class="dac-expand dac-hero dac-light" style="background-repeat:no-repeat">
   <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">
+      <div class="col-9of16 col-push-7of16 dac-hero-figure">
+        <img class="dac-hero-image" src="{@docRoot}images/home/devices-hero_620px_2x.png">
       </div>
-      <div class="col-1of2 col-pull-1of2">
-        <h1 class="dac-hero-title">M Developer Preview</h1>
+      <div class="col-7of16 col-pull-9of16">
+        <h1 class="dac-hero-title">Android M Developer Preview</h1>
         <p class="dac-hero-description">
-          Get ready for the next official release of the platform. The preview program gives
-          you an advance look at new APIs, features, and behaviors coming to Android.
-          Test your apps and give us feedback!
+          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.
         </p>
 
-        <a class="dac-hero-cta" href="{@docRoot}preview/setup-sdk.html">
+        <a class="dac-hero-cta" href="{@docRoot}preview/overview.html">
           <span class="dac-sprite dac-auto-chevron"></span>
-          Get started
+          Get Started!
         </a><br>
-
       </div>
     </div>
 
@@ -38,6 +35,7 @@ footer.hide=1
     </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>