am 0a514c2d: Merge "Doc change: update logo for samples, several edits." into mnc-preview-docs

* commit '0a514c2d1d3afa1e9ebc91d8b95c78bc6903f138':
  Doc change: update logo for samples, several edits.

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="/images/google/hero-play-services_2x.png" style="height:400px">
+        <img class="dac-hero-image" src="{@docRoot}images/google/hero-play-services_2x.png" style="height:400px">
       </div>
       <div class="col-1of2 col-pull-1of2">
         <h1 class="dac-hero-title">Build better apps with Google</h1>
@@ -21,11 +21,11 @@ footer.hide=1
           <p class="dac-hero-description">Start by setting up the Google Play services library,
           then build with the APIs you need. </p>
 
-        <a class="dac-hero-cta" href="https://developers.google.com/android/guides/">
+        <a class="dac-hero-cta" href="{@docRoot}google/play-services/index.html">
           <span class="dac-sprite dac-auto-chevron"></span>
           Set up Google Play services
         </a><br>
-        <a class="dac-hero-cta" href="https://developers.google.com/android/reference/">
+        <a class="dac-hero-cta" href="{@docRoot}reference/gms-packages.html">
           <span class="dac-sprite dac-auto-chevron"></span>
           API Reference
         </a><br>

docs/html/jd_collections.js

@@ -125,7 +125,7 @@ var RESOURCE_COLLECTIONS = {
       "https://developers.google.com/maps/documentation/android/",
       "https://developers.google.com/identity/sign-in/android/",
       "https://developers.google.com/mobile-ads-sdk/download",
-      "https://developers.google.com/gcm/android/",
+      "https://devsite.googleplex.com/cloud-messaging/gcm",
       "https://developers.google.com/app-indexing/"
     ]
   },
@@ -151,7 +151,7 @@ var RESOURCE_COLLECTIONS = {
       "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/android-nanodegree",
+      "https://www.udacity.com/android",
       "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",
@@ -974,7 +974,7 @@ var RESOURCE_COLLECTIONS = {
   "distribute/engage/gcm": {
     "title": "",
     "resources": [
-      "google/gcm/index.html",
+      "https://devsite.googleplex.com/cloud-messaging/gcm",
       "http://developer.chrome.com/apps/cloudMessagingV2",
       "http://www.youtube.com/watch?v=y76rjidm8cU"
     ]

docs/html/jd_extras.js

@@ -132,11 +132,22 @@ DISTRIBUTE_RESOURCES = DISTRIBUTE_RESOURCES.concat([
     "image":"images/cards/card-places_2x.png",
     "type":"Guide"
   },
+  {
+    "title":"GCM Client for Android",
+    "titleFriendly":"",
+    "summary":"Send push notifications and pubsub from your server to Android devices around the world.",
+    "url":"https://developers.google.com/cloud-messaging/android/client",
+    "group":"",
+    "keywords": ["push","gcm"],
+    "tags": [],
+    "image":"images/cards/card-google-cloud-messaging_16-9_2x.png",
+    "type":"Guide"
+  },
   {
     "title":"Google Cloud Messaging",
     "titleFriendly":"",
-    "summary":"Send push notifications and pubsub from your server to your users’ devices around the world.",
+    "summary":"Learn about GCM and the kinds of services you can offer to users through push notifications",
-    "url":"https://developers.google.com/gcm/android/",
+    "url":"https://developers.google.com/cloud-messaging/gcm",
     "group":"",
     "keywords": ["push","gcm"],
     "tags": [],

docs/html/preview/api-overview.jd

@@ -18,10 +18,10 @@ page.image=images/cards/card-api-overview_16-9_2x.png
   <li><a href="#app-linking">App Linking</a></li>
   <li><a href="#backup">Auto Backup for Apps</a></li>
   <li><a href="#authentication">Authentication</a>
-    <ul>
+    <ol>
       <li><a href="#fingerprint-authentication">Fingerprint Authentication</a></li>
       <li><a href="#confirm-credentials">Confirm Credentials</a></li>
-    </ul>
+    </ol>
   </li>
   <li><a href="#direct-share">Direct Share</a></li>
   <li><a href="#voice-interactions">Voice Interactions</a></li>
@@ -35,10 +35,10 @@ page.image=images/cards/card-api-overview_16-9_2x.png
   <li><a href="#audio">Audio Features</a></li>
   <li><a href="#video">Video Features</a></li>
   <li><a href="#camera">Camera Features</a>
-    <ul>
+    <ol>
       <li><a href="#flashlight">Flashlight API</a></li>
       <li><a href="#reprocessing">Camera Reprocessing</a></li>
-    </ul>
+    </ol>
   </li>
   <li><a href="#afw">Android for Work Features</a></li>
 </ol>

docs/html/preview/features/runtime-permissions.jd

@@ -1,6 +1,7 @@
 page.title=Permissions
 page.tags=previewresources, androidm
 page.keywords=permissions, runtime, preview
+page.image=images/permissions_check.png
 @jd:body
 
 

docs/html/preview/index.jd

@@ -19,8 +19,8 @@ footer.hide=1
         <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 <strong>runtime permissions</strong> model,
+          Player. Explore what's new &mdash; <strong>runtime permissions</strong>,
-          power-saving <strong>Doze</strong> and <strong>Standby Mode</strong>, new
+          <strong>Doze</strong> and <strong>App Standby</strong> power-saving features, new
           <strong>assist technology</strong>, and more.
         </p>
 

docs/html/preview/overview.jd

@@ -43,7 +43,7 @@ page.tags="preview", "developer", "android"
       </h5>
 
       <p>
-        You  can get updates over the air, once you’ve flashed a
+        You  can get updates over-the-air, once you’ve flashed a
         device to the initial preview.
       </p>
     </div>
@@ -51,12 +51,6 @@ page.tags="preview", "developer", "android"
 
   <div class="cols">
 
-<!--<div class="col-4of12">
-<h5>Early access to new  APIs</h5>
-<p>Explore the new capabilities and APIs offered in the new platform and give us
-feedback. Note that APIs and capabilities may change during the Preview
-program.</p>
-</div>-->
 
     <div class="col-4of12">
       <h5>
@@ -82,7 +76,7 @@ program.</p>
 
     <div class="col-4of12">
       <h5>
-        Feedback and support channels
+        Feedback and support
       </h5>
 
       <p>
@@ -90,6 +84,7 @@ program.</p>
         "https://code.google.com/p/android-developer-preview/">issue tracker</a>.
         Connect with other developers in the <a
         href="http://g.co/dev/AndroidMDevPreview">M&nbsp;Developer Community</a>.
+
       </p>
     </div>
   </div>
@@ -154,7 +149,7 @@ program.</p>
 <p>
   As you test and develop on Android M, we strongly recommend <strong>keeping
   your development environment up-to-date</strong> as Preview updates are released.
-  To make the process easier, we'll deliver <strong>updates over the air
+  To make the process easier, we'll deliver <strong>updates over-the-air
   (OTA)</strong> to devices already flashed to a Preview build, as well as
   providing system images that you can download and flash manually.
 </p>
@@ -279,8 +274,9 @@ program.</p>
   <li><a href="https://code.google.com/p/android-developer-preview/">M
   Developer Preview Issue Tracker</a> is your <strong>primary feedback
   channel.</strong> You can report bugs, performance issues, and general
-  feedback through the issue tracker. You can also check for known issues
+  feedback through the issue tracker. You can also check for <a
-  and find workaround steps, if available.
+  href="https://code.google.com/p/android-developer-preview/wiki/KnownIssues">known issues</a>
+  and find workaround steps.
   </li>
 
   <li>The <a href="http://g.co/dev/AndroidMDevPreview">Android M Developer

docs/html/preview/testing/guide.jd

@@ -9,6 +9,7 @@ page.image=images/cards/card-set-up_16-9_2x.png
       <ol>
         <li><a href="#runtime-permissions">Testing Permissions</a></li>
         <li><a href="#doze-standby">Testing Doze and App Standby</a></li>
+        <li><a href="#ids">Auto Backup and Device Identifiers</a></li>
       </ol>
   </div>
 </div>
@@ -33,6 +34,7 @@ page.image=images/cards/card-set-up_16-9_2x.png
   </li>
   <li><a href="#doze-mode">Doze and App Standby</a>
   </li>
+  <li><a href="#ids">Auto Backup and Device Identifiers</a></li>
 </ul>
 
 <p>
@@ -174,3 +176,10 @@ $ adb shell am set-idle &lt;packageName&gt; true
     from standby mode. In particular, you should check if your app's Notifications and background
     jobs continue to function as expected.</li>
 </ol>
+
+<h2 id="ids">Auto Backup for Apps and Device-Specific Identifiers</h2>
+
+<p>If your app is persisting any device-specific identifiers, such as Google
+Cloud Messaging registration ID, in internal storage,
+make sure to follow best practices to exclude the storage
+location from auto-backup, as described in <a href="">Auto Backup for Apps</a>. </p>

docs/html/tools/tools_toc.cs

@@ -295,11 +295,8 @@ class="en">Support Library</span></a></div>
   </li><!-- end of support library -->
 
   <li class="nav-section">
-    <div class="nav-section-header"><a href="<?cs var:toroot ?>tools/data-binding/index.html"><span
+    <div class="nav-section-header empty"><a href="<?cs var:toroot ?>tools/data-binding/index.html"><span
 class="en">Data Binding Library</span></a></div>
-    <ul>
-      <li><a href="<?cs var:toroot ?>tools/data-binding/guide.html">Guide</a></li>
-    </ul>
   </li><!-- end of support library -->
 
 

docs/html/training/index.jd

@@ -37,6 +37,6 @@ Classes are organized into several groups you can see at the top-level of the le
        data-query="collection:develop/landing/courses"
        data-sortOrder="random"
        data-cardSizes="6x6"
-       data-maxResults="9"
+       data-maxResults="12"
        data-initial-results="3"></div>
 </div>