Sync jd_extras/jd_collections with jd_extras_en. make a few minor updates.

am: a74a6e5ba9

* commit 'a74a6e5ba92d049710de31c5bcf75e3bda4aadcc':
  Sync jd_extras/jd_collections with jd_extras_en. make a few minor updates.

Change-Id: I681173818b4f7f4fa8e1d1182b7b30a91fefd834

docs/html/about/dashboards/index.jd

@@ -1,5 +1,5 @@
 page.title=Dashboards
-page.metaDescription=page.metaDescription=An overview of device characteristics and platform versions that are active in the Android ecosystem.
+page.metaDescription=An overview of device characteristics and platform versions that are active in the Android ecosystem.
 page.tags="android, dashboard, platforms, versions"
 meta.tags="ecosystem, versions, whatsnew, dashboards"
 page.image=https://chart.googleapis.com/chart?chl=GL%202.0%7CGL%203.0%7CGL%203.1&chf=bg%2Cs%2C00000000&chd=t%3A51.6%2C40.7%2C7.7&chco=c4df9b%2C6fad0c&cht=p&chs=400x250

docs/html/jd_collections.js

@@ -1,3 +1,11 @@
+/*
+ * THIS FILE IS DEPRECATED.
+ *
+ * Please add and edit resource collections in jd_extras_<lang>.js
+ * where lang matches the language code appropriate for the resource.
+ * Last sync'd with jd_extras_<lang>.js on 29 Apr 2016.
+ *
+ */
 var RESOURCE_COLLECTIONS = {
   "index/carousel": {
     "title": "",

docs/html/jd_extras.js

@@ -1,18 +1,11 @@
-/* Metadata represendations of resources that are outside of the autogenerated
+/*
-   local resource lists, or that override local resource representations.
+ * THIS FILE IS DEPRECATED.
-
+ *
-   Resources listed here are referenced from sitemap sections and collections,
+ * Please add and edit resource collections in jd_extras_<lang>.js
-   matched by url string if there is no resource existing in ALL_RESOURCES.
+ * where lang matches the language code appropriate for the resource.
-
+ * Last sync'd with jd_extras_<lang>.js on 29 Apr 2016.
-   Currently, these articles can override only the generated resources
+ *
-   in DISTRIBUTE_RESOURCES. A representation defined here will not be applied
+ */
-   when a collection or section specifies a url that's not in DISTRIBUTE_RESOURCEs.
-   Also
-   So if a section url refers to a static doc that's
-   not in a distribute section, you need to create an item for
-   it in this file. Fix is to compare across
-   ALL_RESOURCES_BY_URL.  */
-
 DISTRIBUTE_RESOURCES = DISTRIBUTE_RESOURCES.concat([
  /* TODO Remove standard resources from here, such as below
  */

docs/html/jd_extras_en.js

@@ -1,21 +1,54 @@
-/* Metadata represendations of resources that are outside of the autogenerated
+/* Metadata extensions for the specified language
-   local resource lists, or that override local resource representations.
+   as well as resource collection definitions.
 
-   Resources listed here are referenced from queries and collections,
+   'Extras' defined in this file are metadata represendations of
-   matched by url string.
+   resources that are outside the autogenerated local resource lists,
+   or representations that override the default representations. 
+   (Overriding the default is not recommended)
 
-   Currently, these articles can override only the generated resources
+   'Collections' are a predefined set of resources that pages can
-   in DISTRIBUTE_RESOURCES. A representation defined here will not be applied
+   display by referencing the collection name in a data query. Urls
-   when a collection or section specifies a url that's not in DISTRIBUTE_RESOURCEs.
+   listed in a collection must map exactly to urls in local metadata
-   Also
+   resources (either default or extras).
-   So if a section url refers to a static doc that's
+
-   not in a distribute section, you need to create an item for
+   'Carousel overrides' are extras that override a default resource
-   it in this file. Fix is to compare across
+   for the purpose of customizing the text and display in carousels/heros.
-   ALL_RESOURCES_BY_URL.  */
+   Urls referenced must map exactly to urls in local metadata
+   resources (either default or extras).
+
+   'Static search results' are metadata objects that are returned in
+   the search results page when the user enters the object's keyword.
+
+   The extras, collections, carousel overrides, and static search results
+   listed here are referenced from dynamic content queries, matched by
+   url string.
+  */
 
 METADATA['en'].extras = METADATA['en'].extras.concat([
  /* TODO Remove standard resources from here, such as below
  */
+  {
+    "title":"Writing More Code by Writing Less Code with Android Studio Live Templates",
+    "category":"",
+    "summary":"Unless you’re getting paid by the keystroke, no one wants to write repetitive boilerplate code.",
+    "url":"https://medium.com/google-developers/writing-more-code-by-writing-less-code-with-android-studio-live-templates-244f648d17c7#.hczcm02du",
+    "group":"",
+    "keywords": [],
+    "tags": ['studio'],
+    "image":"https://cdn-images-1.medium.com/max/800/1*JkrYXGs1AxZAbK0sCLrJAQ.gif",
+    "type":"medium"
+  },
+  {
+    "title":"How Often Should You Update Android Studio?",
+    "category":"",
+    "summary":"One of the beauties of Android Studio is how quickly is evolves and improves.",
+    "url":"https://medium.com/google-developers/how-often-should-you-update-android-studio-db25785c488e#.8blbql35x",
+    "group":"",
+    "keywords": [],
+    "tags": ['studio'],
+    "image":"https://cdn-images-1.medium.com/max/2000/1*chMiA9mGa_FBUOoesHHk3Q.png",
+    "type":"medium"
+  },
   {
     "title":"Measure your app’s user acquisition channels",
     "category":"google",
@@ -642,7 +675,18 @@ METADATA['en'].extras = METADATA['en'].extras.concat([
     "keywords": [],
     "tags": [],
     "image":"distribute/images/gp-edu-apps-image.jpg",
-    "type":"distribute"
+    "type":"google"
+  },
+  {
+    "title":"Keeping Your App Responsive",
+    "category":"performance",
+    "summary":"This document describes how the Android system determines whether an application is not responding and provides guidelines for ensuring that your application stays responsive.",
+    "url":"training/articles/perf-anr.html",
+    "group":"",
+    "keywords": [],
+    "tags": [],
+    "image":"",
+    "type":"google"
   },
   {
     "title":"Google Play Game Services",
@@ -770,7 +814,7 @@ METADATA['en'].extras = METADATA['en'].extras.concat([
     "type": "distribute",
     "category": "google play"
   },
-{
+  {
     "lang": "en",
     "group": "",
     "tags": [],
@@ -1266,7 +1310,7 @@ METADATA['en'].extras = METADATA['en'].extras.concat([
     "lang": "en",
     "group": "",
     "tags": [
-      "#gcm",
+      "gcm",
     ],
     "url": "https://developer.chrome.com/apps/cloudMessagingV2",
     "timestamp": 1383243492000,
@@ -1277,12 +1321,11 @@ METADATA['en'].extras = METADATA['en'].extras.concat([
     "type": "distribute",
     "category": "google"
   },
-
   {
     "lang": "en",
     "group": "",
     "tags": [
-      "#sdkupdates"
+      ""
     ],
     "url": "https://android-developers.blogspot.com/2013/07/making-beautiful-android-app-icons.html",
     "timestamp": 1194884220000,
@@ -1293,11 +1336,11 @@ METADATA['en'].extras = METADATA['en'].extras.concat([
     "type": "blog",
     "category": ""
   },
-     {
+  {
     "lang": "en",
     "group": "",
     "tags": [
-      "#sdkupdates"
+      ""
     ],
     "url": "https://android-developers.blogspot.com/2012/12/localize-your-promotional-graphics-on.html",
     "timestamp": 1194884220000,
@@ -1308,11 +1351,11 @@ METADATA['en'].extras = METADATA['en'].extras.concat([
     "type": "blog",
     "category": ""
   },
-   {
+  {
     "lang": "en",
     "group": "",
     "tags": [
-      "#sdkupdates"
+      ""
     ],
     "url": "https://android-developers.blogspot.com/2013/10/making-your-app-content-more-accessible.html",
     "timestamp": 1194884220000,
@@ -2900,6 +2943,18 @@ METADATA['en'].extras = METADATA['en'].extras.concat([
     "lang":"en",
     "type":"distribute"
   },
+  {
+    "title":"What’s New in Android N Developer Preview",
+    "category":"preview",
+    "summary":"Learn all about the new features in the Android N Preview.",
+    "url":"https://www.youtube.com/watch?v=CsulIu3UaUM",
+    "group":"",
+    "keywords": ["androidn"],
+    "tags": [],
+    "image":"https://i1.ytimg.com/vi/CsulIu3UaUM/maxresdefault.jpg",
+    "lang":"en",
+    "type":"youtube"
+  },
   {
     "title":"Developing for Android 6.0 (Marshmallow)",
     "category":"",
@@ -3119,6 +3174,19 @@ METADATA['en'].extras = METADATA['en'].extras.concat([
     "tags" : "users,googleplay,googleio",
     "summary": "Learn how to get new users, using Universal app campaigns directly within the Google Play Developer Console to increase your installs from ads, and find out how your acquisition channels perform.",
   },
+  {
+    "lang": "en",
+    "group": "",
+    "tags": ["play,protips"],
+    "url": "shareables/distribute/secrets_play/v2/web/secrets_to_app_success_v2_en.pdf",
+    "timestamp": 1447437450,
+    "image": "images/distribute/secrets_v2_banner.jpg",
+    "title": "The Secrets to App Success on Google Play",
+    "summary": "Get the updated guide full of useful features, tips, and best practices that will help you grow a successful app or game business on Google Play.",
+    "keywords": ["secrets, success, play, google"],
+    "type": "Book",
+    "category": "distribute"
+  },
   {
     "url":"panel1",
     "image": "",
@@ -3275,8 +3343,8 @@ METADATA['en'].collections = {
   "index/secondary/carousel": {
     "title": "",
     "resources": [
-      "http://www.youtube.com/watch?v=Pms0pcyPbAM",
       "http://www.youtube.com/watch?v=9m6MoBM-sFI",
+      "http://www.youtube.com/watch?v=Pms0pcyPbAM",
       "http://www.youtube.com/watch?v=e7t3svG9PTk",
       "http://www.youtube.com/watch?v=J3IvOfvH1ys"
     ]
@@ -3379,7 +3447,6 @@ METADATA['en'].collections = {
     "title": "",
     "resources": [
       "https://www.youtube.com/watch?v=K2dodTXARqc&list=PLWz5rJ2EKKc8I9gHTMh5yKkwRRGE8BjbQ",
-      "https://www.youtube.com/watch?v=3PIc-DuEU2s&list=PLWz5rJ2EKKc9e0d55YHgJFHXNZbGHEXJX",
       "https://www.youtube.com/watch?v=cD7NPxuuXYY&list=PLWz5rJ2EKKc8I9gHTMh5yKkwRRGE8BjbQ",
       "https://www.youtube.com/watch?v=JLLnhwtDoHw&list=PLWz5rJ2EKKc8I9gHTMh5yKkwRRGE8BjbQ",
       "https://www.youtube.com/watch?v=2I6fuD20qlY&list=PLWz5rJ2EKKc8I9gHTMh5yKkwRRGE8BjbQ",
@@ -4527,21 +4594,6 @@ METADATA['en'].collections = {
       "distribute/googleplay/auto.html"
     ]
   },
-  "distribute/stories/games": {
-    "title": "",
-    "resources": [
-      "https://storage.googleapis.com/androiddevelopers/shareables/stories/Glu_Deerhunter2014_gpgs.pdf",
-      "https://storage.googleapis.com/androiddevelopers/shareables/stories/ConcreteSoftware_PBABowling_gpgs.pdf",
-      "https://storage.googleapis.com/androiddevelopers/shareables/stories/Dragonplay_DragonplaySlots_gpgs.pdf",
-      "https://storage.googleapis.com/androiddevelopers/shareables/stories/Gameloft_Asphalt8_gpgs.pdf",
-      "https://storage.googleapis.com/androiddevelopers/shareables/stories/Glu_EternityWarriors3_gpgs.pdf",
-      "https://storage.googleapis.com/androiddevelopers/shareables/stories/HotheadGames_RivalsatWar_gpgs.pdf",
-      "https://storage.googleapis.com/androiddevelopers/shareables/stories/TMSOFT_Compulsive_gpgs.pdf",
-      "https://storage.googleapis.com/androiddevelopers/shareables/stories/Noodlecake_SuperStickmanGolf2_gpgs.pdf",
-      "https://storage.googleapis.com/androiddevelopers/shareables/stories/TinyRebel_DoctorWhoLegacy_gpgs.pdf",
-      "https://storage.googleapis.com/androiddevelopers/shareables/stories/Senri_LeosFortune_gpgs.pdf"
-    ]
-  },
   "training/testing/overview": {
     "title": "",
     "resources": [
@@ -4578,6 +4630,21 @@ METADATA['en'].collections = {
       "https://google.github.io/android-testing-support-library"
     ]
   },
+  "distribute/stories/games": {
+    "title": "",
+    "resources": [
+      "https://storage.googleapis.com/androiddevelopers/shareables/stories/Glu_Deerhunter2014_gpgs.pdf",
+      "https://storage.googleapis.com/androiddevelopers/shareables/stories/ConcreteSoftware_PBABowling_gpgs.pdf",
+      "https://storage.googleapis.com/androiddevelopers/shareables/stories/Dragonplay_DragonplaySlots_gpgs.pdf",
+      "https://storage.googleapis.com/androiddevelopers/shareables/stories/Gameloft_Asphalt8_gpgs.pdf",
+      "https://storage.googleapis.com/androiddevelopers/shareables/stories/Glu_EternityWarriors3_gpgs.pdf",
+      "https://storage.googleapis.com/androiddevelopers/shareables/stories/HotheadGames_RivalsatWar_gpgs.pdf",
+      "https://storage.googleapis.com/androiddevelopers/shareables/stories/TMSOFT_Compulsive_gpgs.pdf",
+      "https://storage.googleapis.com/androiddevelopers/shareables/stories/Noodlecake_SuperStickmanGolf2_gpgs.pdf",
+      "https://storage.googleapis.com/androiddevelopers/shareables/stories/TinyRebel_DoctorWhoLegacy_gpgs.pdf",
+      "https://storage.googleapis.com/androiddevelopers/shareables/stories/Senri_LeosFortune_gpgs.pdf"
+    ]
+  },
   "overview/1": {
     "title": "",
     "resources": [
@@ -4622,10 +4689,11 @@ METADATA['en'].collections = {
     "resources": [
       "training/enterprise/app-compatibility.html",
       "training/enterprise/app-restrictions.html",
+      "training/enterprise/cosu.html",
       "https://www.youtube.com/watch?v=39NkpWkaH8M&index=2&list=PLOU2XLYxmsIKAK2Bhv19H2THwF-22O5WX",
       "samples/AppRestrictionSchema/index.html",
-      "samples/AppRestrictionEnforcer/index.html",
+      "https://www.youtube.com/watch?v=dH41OutAMNM",
-      "https://www.youtube.com/watch?v=dH41OutAMNM"
+      "samples/AppRestrictionEnforcer/index.html"
     ]
   },
   "training/work/admin": {
@@ -4636,6 +4704,37 @@ METADATA['en'].collections = {
       "https://www.youtube.com/watch?v=j3QC6hcpy90"
     ]
   },
+"tools/help/log": {
+    "title": "",
+    "resources": [
+       "tools/help/am-logcat.html"
+    ]
+  },
+"tools/help/monitor": {
+    "title": "",
+    "resources": [
+       "tools/help/am-memory.html",
+       "tools/help/am-cpu.html",
+       "tools/help/am-gpu.html",
+       "tools/help/am-network.html"
+    ]
+  },
+ "tools/help/data": {
+    "title": "",
+    "resources": [
+       "tools/help/am-hprof.html",
+       "tools/help/am-allocation.html",
+       "tools/help/am-methodtrace.html",
+       "tools/help/am-sysinfo.html"
+    ]
+  },
+  "tools/help/shot": {
+    "title": "",
+    "resources": [
+       "tools/help/am-screenshot.html",
+       "tools/help/am-video.html"
+    ]
+  },
   "tools/performance/rendering": {
     "title": "",
     "resources": [
@@ -4738,6 +4837,7 @@ METADATA['en'].collections = {
   "preview/landing/more": {
     "title": "",
     "resources": [
+      "https://www.youtube.com/watch?v=CsulIu3UaUM",
       "preview/features/multi-window.html",
       "preview/features/notification-updates.html",
       "preview/features/background-optimization.html",
@@ -4749,11 +4849,14 @@ METADATA['en'].collections = {
       "preview/features/picture-in-picture.html",
       "preview/features/tv-recording-api.html"
     ]
-  }
+  },
 };
 
 /**
  * Static search results.
+
+   Metadata objects returned in search results page when the user enters
+   each object's keyword.
  */
 METADATA['en'].searchHeroCollections = {
   "material": {