am b514de9f: am 518651c8: Fix download button\'s terms check. Add some cards. Fix some broken stuff.

* commit 'b514de9fcb0fe7d7abcc0de6acea92a6aad1b914':
  Fix download button's terms check. Add some cards. Fix some broken stuff.

21 files changed, 67 insertions, 81 deletions

diff --git a/docs/html/distribute/googleplay/work/about.jd b/docs/html/distribute/googleplay/work/about.jd
index bd0f72b..20fec7a 100644
--- a/docs/html/distribute/googleplay/work/about.jd
+++ b/docs/html/distribute/googleplay/work/about.jd
@@ -55,7 +55,7 @@ page.image=images/distribute/gpfw.jpg
   <li>Follow best practices for security and manage user data properly. Businesses
   are more conscious of data security and employee productivity, especially when it
   comes to features that share information with other services.</li>
-  <li>Support the <a href="{@docRoot}training/enterprise/app-restrictions.html">App Configuration framework to let an administrator remotely configure app settings such as:
+  <li>Support the <a href="{@docRoot}training/enterprise/app-restrictions.html">App Configuration framework</a> to let an administrator remotely configure app settings such as:
     <ul>
       <li>Server address and protocol settings</li>
       <li>The ability to switch features on and off</li>
diff --git a/docs/html/distribute/index.jd b/docs/html/distribute/index.jd
index c8928df..a6ece63 100644
--- a/docs/html/distribute/index.jd
+++ b/docs/html/distribute/index.jd
@@ -43,11 +43,11 @@ page.metaDescription=The most visited store in the world for Android apps. Cloud
       <span class="dac-sprite dac-auto-chevron"></span>
       Get started
     </a></li>
-    <li class="dac-section-link"><a href="/distribute/essentials/index.html#quality-guidelines">
+    <li class="dac-section-link"><a href="/distribute/essentials/index.html#guidelines">
       <span class="dac-sprite dac-auto-chevron"></span>
       Quality guidelines
     </a></li>
-    <li class="dac-section-link"><a href="/distribute/essentials/index.html#tools-and-resources">
+    <li class="dac-section-link"><a href="/distribute/essentials/index.html#tools">
       <span class="dac-sprite dac-auto-chevron"></span>
       Resources &amp; tools
     </a></li>
diff --git a/docs/html/distribute/users/app-invites.jd b/docs/html/distribute/users/app-invites.jd
index ec9579d..e19e6eb 100644
--- a/docs/html/distribute/users/app-invites.jd
+++ b/docs/html/distribute/users/app-invites.jd
@@ -1,7 +1,7 @@
 page.title=Smarter App Invites
 page.metaDescription=Tap into your existing user base to increase downloads and increase conversions.
 page.tags="google", "identity", "signin"
-page.image=distribute/images/advertising.jpg
+page.image=images/cards/card-app-invites_16-9_2x.png
 
 @jd:body
 
diff --git a/docs/html/distribute/users/house-ads.jd b/docs/html/distribute/users/house-ads.jd
index d662fb2..ec73393 100644
--- a/docs/html/distribute/users/house-ads.jd
+++ b/docs/html/distribute/users/house-ads.jd
@@ -1,4 +1,4 @@
-page.title=Cross-Sell to Users with House Ads
+page.title=Cross-Sell with House Ads
 page.metaDescription=Tap into your existing user base to increase downloads and increase conversions.
 page.tags="google", "identity", "signin"
 page.image=distribute/images/advertising.jpg
diff --git a/docs/html/distribute/users/index.jd b/docs/html/distribute/users/index.jd
index 4da4077..23f08c4 100644
--- a/docs/html/distribute/users/index.jd
+++ b/docs/html/distribute/users/index.jd
@@ -13,13 +13,13 @@ nonavpage=true
 <div class="resource-widget resource-flow-layout landing col-16"
   data-query="collection:distribute/users"
   data-cardSizes="6x6"
-  data-maxResults="9">
+  data-maxResults="15">
 </div>
-<div class="resource-widget resource-flow-layout landing col-16"
+<!--<div class="resource-widget resource-flow-layout landing col-16"
   data-query="collection:distribute/users"
   data-cardSizes="9x3"
   data-maxResults="16">
-</div>
+</div>-->
 
 <!-- <h2>Related resources</h2>
 
diff --git a/docs/html/images/cards/card-app-invites_16-9_2x.png b/docs/html/images/cards/card-app-invites_16-9_2x.png
new file mode 100644
index 0000000..e0da07e
--- /dev/null
+++ b/docs/html/images/cards/card-app-invites_16-9_2x.png
diff --git a/docs/html/images/cards/card-app-linking_2x.png b/docs/html/images/cards/card-app-linking_2x.png
new file mode 100644
index 0000000..abff805
--- /dev/null
+++ b/docs/html/images/cards/card-app-linking_2x.png
diff --git a/docs/html/images/cards/card-auto-backup_2x.png b/docs/html/images/cards/card-auto-backup_2x.png
new file mode 100644
index 0000000..3c79ba9
--- /dev/null
+++ b/docs/html/images/cards/card-auto-backup_2x.png
diff --git a/docs/html/images/cards/card-test-performance_2x.png b/docs/html/images/cards/card-test-performance_2x.png
new file mode 100644
index 0000000..fd949c8
--- /dev/null
+++ b/docs/html/images/cards/card-test-performance_2x.png
diff --git a/docs/html/images/permissions_check.png b/docs/html/images/permissions_check.png
index bbbba4f..376d0fa 100644
--- a/docs/html/images/permissions_check.png
+++ b/docs/html/images/permissions_check.png
diff --git a/docs/html/jd_collections.js b/docs/html/jd_collections.js
index d39bb0f..073feb8 100644
--- a/docs/html/jd_collections.js
+++ b/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://devsite.googleplex.com/cloud-messaging/gcm",
+      "https://developers.google.com/cloud-messaging/gcm",
       "https://developers.google.com/app-indexing/"
     ]
   },
@@ -160,12 +160,15 @@ var RESOURCE_COLLECTIONS = {
       "https://www.udacity.com/course/gradle-for-android-and-java--ud867"
     ]
   },
-  "preview/landing/herolinks": {
+  "preview/landing/more": {
     "title": "",
     "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"
+      "preview/features/runtime-permissions.html",
+      "preview/behavior-changes.html",
+      "preview/backup/index.html",
+      "preview/features/app-linking.html",
+      "preview/testing/guide.html",
+      "preview/testing/performance.html",
     ]
   },
   "distribute/landing/carousel": {
@@ -974,9 +977,8 @@ var RESOURCE_COLLECTIONS = {
   "distribute/engage/gcm": {
     "title": "",
     "resources": [
-      "https://devsite.googleplex.com/cloud-messaging/gcm",
-      "http://developer.chrome.com/apps/cloudMessagingV2",
-      "http://www.youtube.com/watch?v=y76rjidm8cU"
+      "https://developers.google.com/cloud-messaging/gcm",
+      "https://developers.google.com/cloud-messaging/android/client",
     ]
   },
   "distribute/engage/googleplaygames": {
diff --git a/docs/html/preview/backup/index.jd b/docs/html/preview/backup/index.jd
index c7d85ae..6735379 100644
--- a/docs/html/preview/backup/index.jd
+++ b/docs/html/preview/backup/index.jd
@@ -1,7 +1,7 @@
 page.title=Auto Backup for Apps
 page.tags=backup, previewresources, androidm
 page.keywords=backup, autobackup, preview
-
+page.image=images/cards/card-auto-backup_2x.png
 @jd:body
 
 <div id="qv-wrapper">
diff --git a/docs/html/preview/behavior-changes.jd b/docs/html/preview/behavior-changes.jd
index 568d46e..2efa80a 100644
--- a/docs/html/preview/behavior-changes.jd
+++ b/docs/html/preview/behavior-changes.jd
@@ -1,6 +1,6 @@
 page.title=Behavior Changes
 page.keywords=preview,sdk,compatibility
-sdk.platform.apiLevel=22-mnc
+sdk.platform.apiLevel=MNC
 @jd:body
 
 <div id="qv-wrapper">
diff --git a/docs/html/preview/download.jd b/docs/html/preview/download.jd
index ee505a9..a4db82f 100644
--- a/docs/html/preview/download.jd
+++ b/docs/html/preview/download.jd
@@ -336,9 +336,6 @@ This is the Android SDK Preview License Agreement (the “License Agreement”).
       location.hash = "";
       return true;
     } else {
-      $("label#agreeLabel").parent().stop().animate({color: "#258AAF"}, 200,
-        function() {$("label#agreeLabel").parent().stop().animate({color: "#222"}, 200)}
-      );
       return false;
     }
   }
diff --git a/docs/html/preview/features/app-linking.jd b/docs/html/preview/features/app-linking.jd
index ffca1a9..5592323 100644
--- a/docs/html/preview/features/app-linking.jd
+++ b/docs/html/preview/features/app-linking.jd
@@ -1,8 +1,8 @@
 page.title=App Links
-
+page.image=images/cards/card-app-linking_2x.png
+page.keywords=applinking, deeplinks, intents
 @jd:body
 
-
 <div id="qv-wrapper">
   <div id="qv">
     <h2>In this document</h2>
diff --git a/docs/html/preview/index.jd b/docs/html/preview/index.jd
index 4ea5b4a..eb18aa6 100644
--- a/docs/html/preview/index.jd
+++ b/docs/html/preview/index.jd
@@ -1,6 +1,6 @@
 page.title=Android M Developer Preview
 page.tags="preview",
-meta.tags="preview, M preview"
+meta.tags="preview, M preview", androidm
 fullpage=true
 section.landing=true
 header.hide=1
@@ -44,24 +44,25 @@ footer.hide=1
   <div class="dac-section-subtitle">
     Essential information to help you get your apps ready for Android M.
   </div>
+ 
   <div class="resource-widget resource-flow-layout col-16"
-       data-query="tag:previewresources"
+       data-query="collection:preview/landing/more"
        data-cardSizes="6x6"
-       data-initial-results="6"
        data-maxResults="16"></div>
 
-  <ul class="dac-section-links">
-    <li class="dac-section-link"><a href="http://g.co/dev/AndroidMDevPreview">
-      <span class="dac-sprite dac-auto-chevron"></span>
-      Join G+ Community
-    </a></li>
-
-    <li class="dac-section-link">
-      <a href="https://code.google.com/p/android-developer-preview/">
+    <ul class="dac-section-links">
+      <li class="dac-section-link">
+        <a href="https://code.google.com/p/android-developer-preview/">
+          <span class="dac-sprite dac-auto-chevron"></span>
+          Report Issues
+        </a>
+      </li> 
+      <li class="dac-section-link"><a href="http://g.co/dev/AndroidMDevPreview">
         <span class="dac-sprite dac-auto-chevron"></span>
-        Report Issues
-      </a>
-    </li>
-  </ul>
-</div></section>
+        Join G+ Community
+        </a>
+      </li>
+    </ul>
+  </div>
+</section>
 
diff --git a/docs/html/preview/preview_toc.cs b/docs/html/preview/preview_toc.cs
index 07afcdd..d0aa55f 100644
--- a/docs/html/preview/preview_toc.cs
+++ b/docs/html/preview/preview_toc.cs
@@ -33,7 +33,7 @@
         <li><a href="<?cs var:toroot ?>preview/features/app-linking.html">
           App Links</a></li>
         <li><a href="<?cs var:toroot ?>preview/backup/index.html">
-          Automatic Backups</a></li>
+          Auto Backup for Apps</a></li>
       </ul>
   </li>
 
diff --git a/docs/html/preview/testing/guide.jd b/docs/html/preview/testing/guide.jd
index 5e8e8d8..0591465 100644
--- a/docs/html/preview/testing/guide.jd
+++ b/docs/html/preview/testing/guide.jd
@@ -1,5 +1,6 @@
 page.title=Testing Guide
-page.image=images/cards/card-set-up_16-9_2x.png
+page.image=images/cards/card-build_16x9_2x.png
+page.keywords=previewresources,androidm,testing,permissions
 
 @jd:body
 
@@ -182,4 +183,5 @@ $ adb shell am set-idle &lt;packageName&gt; true
 <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>
+location from auto-backup, as described in <a href="{@docRoot}preview/backup/index.html">Auto
+Backup for Apps</a>. </p>
diff --git a/docs/html/preview/testing/performance.jd b/docs/html/preview/testing/performance.jd
index a61091f..4ac5a90 100644
--- a/docs/html/preview/testing/performance.jd
+++ b/docs/html/preview/testing/performance.jd
@@ -1,4 +1,6 @@
 page.title=Testing Display Performance
+page.image=images/cards/card-test-performance_2x.png
+page.keywords=performance, fps, tools
 
 @jd:body
 
diff --git a/docs/html/tools/data-binding/guide.jd b/docs/html/tools/data-binding/guide.jd
index 6a933d8..71409e4 100644
--- a/docs/html/tools/data-binding/guide.jd
+++ b/docs/html/tools/data-binding/guide.jd
@@ -26,16 +26,16 @@ tracker</a>. Stay tuned for more information about Data Binding and examples of
         <a href="#data_binding_layout_files">Data Binding Layout Files</a>
         <ol>
           <li>
-            <a href="writing_expressions">Writing your first data binding
+            <a href="#writing_expressions">Writing your first data binding
             expressions</a>
           </li>
 
           <li>
-            <a href="data_object">Data Object</a>
+            <a href="#data_object">Data Object</a>
           </li>
 
           <li>
-            <a href="binding_data">Binding Data</a>
+            <a href="#binding_data">Binding Data</a>
           </li>
         </ol>
       </li>
@@ -44,23 +44,23 @@ tracker</a>. Stay tuned for more information about Data Binding and examples of
         <a href="#layout_details">Layout Details</a>
         <ol>
           <li>
-            <a href="imports">Imports</a>
+            <a href="#imports">Imports</a>
           </li>
 
           <li>
-            <a href="variables">Variables</a>
+            <a href="#variables">Variables</a>
           </li>
 
           <li>
-            <a href="custom_binding_class_names">Custom Binding Class Names</a>
+            <a href="#custom_binding_class_names">Custom Binding Class Names</a>
           </li>
 
           <li>
-            <a href="includes">Includes</a>
+            <a href="#includes">Includes</a>
           </li>
 
           <li>
-            <a href="expression_language">Expression Language</a>
+            <a href="#expression_language">Expression Language</a>
           </li>
         </ol>
       </li>
@@ -69,15 +69,15 @@ tracker</a>. Stay tuned for more information about Data Binding and examples of
         <a href="#data_objects">Data Objects</a>
         <ol>
           <li>
-            <a href="observable_objects">Observable Objects</a>
+            <a href="#observable_objects">Observable Objects</a>
           </li>
 
           <li>
-            <a href="observablefields">ObservableFields</a>
+            <a href="#observablefields">ObservableFields</a>
           </li>
 
           <li>
-            <a href="observable_collections">Observable Collections</a>
+            <a href="#observable_collections">Observable Collections</a>
           </li>
         </ol>
       </li>
@@ -86,23 +86,23 @@ tracker</a>. Stay tuned for more information about Data Binding and examples of
         <a href="#generated_binding">Generated Binding</a>
         <ol>
           <li>
-            <a href="creating">Creating</a>
+            <a href="#creating">Creating</a>
           </li>
 
           <li>
-            <a href="views_with_ids">Views With IDs</a>
+            <a href="#views_with_ids">Views With IDs</a>
           </li>
 
           <li>
-            <a href="variables">Variables</a>
+            <a href="#variables">Variables</a>
           </li>
 
           <li>
-            <a href="viewstubs">ViewStubs</a>
+            <a href="#viewstubs">ViewStubs</a>
           </li>
 
           <li>
-            <a href="advanced_binding">Advanced Binding</a>
+            <a href="#advanced_binding">Advanced Binding</a>
           </li>
         </ol>
       </li>
@@ -111,15 +111,15 @@ tracker</a>. Stay tuned for more information about Data Binding and examples of
         <a href="#attribute_setters">Attribute Setters</a>
         <ol>
           <li>
-            <a href="automatic_setters">Automatic Setters</a>
+            <a href="#automatic_setters">Automatic Setters</a>
           </li>
 
           <li>
-            <a href="renamed_setters">Renamed Setters</a>
+            <a href="#renamed_setters">Renamed Setters</a>
           </li>
 
           <li>
-            <a href="custom_setters">Custom Setters</a>
+            <a href="#custom_setters">Custom Setters</a>
           </li>
         </ol>
       </li>
@@ -128,11 +128,11 @@ tracker</a>. Stay tuned for more information about Data Binding and examples of
         <a href="#converters">Converters</a>
         <ol>
           <li>
-            <a href="object_conversions">Object Conversions</a>
+            <a href="#object_conversions">Object Conversions</a>
           </li>
 
           <li>
-            <a href="custom_conversions">Custom Conversions</a>
+            <a href="#custom_conversions">Custom Conversions</a>
           </li>
         </ol>
       </li>
diff --git a/docs/html/tools/data-binding/index.jd b/docs/html/tools/data-binding/index.jd
deleted file mode 100644
index 4ad11b6..0000000
--- a/docs/html/tools/data-binding/index.jd
+++ /dev/null
@@ -1,18 +0,0 @@
-page.title=Android Data Binding Library
-page.metaDescription=
-
-@jd:body
-
-<p>
-  Some text here.
-</p>
-
-
-
-<!--  <h2>Related Resources</h2>
-  <div class="resource-widget resource-flow-layout col-16"
-    data-query="tag:engagement"
-    data-sortOrder="random"
-    data-cardSizes="6x2"
-    data-maxResults="3">
-  </div> -->