Merge "Doc change: edits and image updates." into mnc-preview-docs

docs/html/develop/index.jd

@@ -13,7 +13,8 @@ excludeFromSuggestions=true
   <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="{@docRoot}images/develop/studio-open.png">
+        <img class="dac-hero-image" src="{@docRoot}images/develop/hero_image_studio5_2x.png"
+          srcset="/images/develop/hero_image_studio5.png 1x, /images/develop/hero_image_studio5_2x.png 2x" />
       </div>
       <div class="col-1of2 col-pull-1of2">
         <h1 class="dac-hero-title">Get Started with Android Studio</h1>

docs/html/distribute/googleplay/auto.jd

@@ -1,4 +1,4 @@
-page.title=Distributing to Android Auto
+page.title=Distribute to Android Auto
 page.image=/design/auto/images/auto-overview.png
 meta.tags="auto", "publish", "quality"
 page.tags="auto", "publish", "googleplay"

docs/html/distribute/googleplay/cast.jd

@@ -4,9 +4,9 @@ page.tags=cast, video, chromecast
 @jd:body
 
 <p>
-  The average person spends 3 hours per day watching the TV. With Google Cast
+  With Google Cast
   you make it easy for users to include your content as part of their viewing
-  schedule. All they need is an Android TV, a TV with a Chromecast plugged in,
+  on TV and listening on audio systems. All they need is an Android TV, a TV with a Chromecast plugged in,
   or a Cast for audio device connected to their audio system.
 </p>
 

docs/html/distribute/googleplay/googleplay_toc.cs

@@ -7,7 +7,7 @@
   </li>
   <li class="nav-section">
     <div class="nav-section-header empty" style="font-weight:normal"><a href="<?cs var:toroot?>distribute/googleplay/start.html">
-            <span class="en">Get Started with Publishing</span>
+            <span class="en">Get Started <br />with Publishing</span>
           </a>
     </div>
   </li>
@@ -19,37 +19,37 @@
   </li>
   <li class="nav-section">
     <div class="nav-section-header empty" style="font-weight:normal"><a href="<?cs var:toroot?>distribute/googleplay/guide.html">
-    <span class="en">Finding Success on <span style="white-space:nowrap">Google Play</span></span>
+    <span class="en">Find Success on <span style="white-space:nowrap">Google Play</span></span>
         </a>
     </div>
   </li>
   <li class="nav-section">
     <div class="nav-section-header empty" style="font-weight:normal"><a href="<?cs var:toroot?>distribute/googleplay/wear.html">
-          <span class="en">Distributing to <span style="white-space:nowrap">Android Wear</span></span>
+    <span class="en">Distribute to <br /><span style="white-space:nowrap">Android Wear</span></span>
         </a>
     </div>
   </li>
   <li class="nav-section">
     <div class="nav-section-header empty" style="font-weight:normal"><a href="<?cs var:toroot?>distribute/googleplay/tv.html">
-          <span class="en">Distributing to <span style="white-space:nowrap">Android TV</span></span>
+          <span class="en">Distribute to <br /><span style="white-space:nowrap">Android TV</span></span>
         </a>
     </div>
   </li>
   <li class="nav-section">
     <div class="nav-section-header empty" style="font-weight:normal"><a href="<?cs var:toroot?>distribute/googleplay/auto.html">
-          <span class="en">Distributing to <span style="white-space:nowrap">Android Auto</span></span>
+          <span class="en">Distribute to <br /><span style="white-space:nowrap">Android Auto</span></span>
         </a>
     </div>
   </li>
   <li class="nav-section">
     <div class="nav-section-header empty" style="font-weight:normal"><a href="<?cs var:toroot?>distribute/googleplay/cast.html">
-          <span class="en">Stream Your Content<span style="white-space:nowrap">with Cast</span></span>
+          <span class="en">Stream Your Content <span style="white-space:nowrap">with Cast</span></span>
         </a>
     </div>
   </li>
   <li class="nav-section">
     <div class="nav-section-header empty" style="font-weight:normal"><a href="<?cs var:toroot?>distribute/googleplay/cardboard.html">
-          <span class="en"><span style="white-space:nowrap">Build VR with Cardboard</span></span>
+          <span class="en"><span style="white-space:nowrap">Build VR with Google Cardboard</span></span>
         </a>
     </div>
   </li>

docs/html/distribute/googleplay/tv.jd

@@ -1,4 +1,4 @@
-page.title=Distributing to Android TV
+page.title=Distribute to Android TV
 page.image=/design/tv/images/atv-home.jpg
 meta.tags="tv", "publish", "quality"
 page.tags="tv", "publish", "googleplay"

docs/html/distribute/googleplay/wear.jd

@@ -1,4 +1,4 @@
-page.title=Distributing to Android Wear
+page.title=Distribute to Android Wear
 page.image=/design/media/wear/ContextualExample.008_2x.png
 meta.tags="wear", "publish", "quality"
 page.tags="wear", "publish", "googleplay"

docs/html/distribute/users/ota-installs.jd

@@ -14,7 +14,7 @@ they sign-in, without the need for them to visit the Play store. Using this appr
 some developers have seen app installation acceptance rates of 40%.</p>
 
 <p>Get started with <a href="https://developers.google.com/identity/sign-in/android/">
-Google sign-in for Android/a> and then enable <a
+Google sign-in for Android</a> and then enable <a
 href="https://developers.google.com/identity/sign-in/web/android-app-installs">over-the-air
 installs</a> for your web site.</p>
 

docs/html/google/index.jd

@@ -16,12 +16,14 @@ footer.hide=1
       <div class="col-1of2 col-pull-1of2">
         <h1 class="dac-hero-title">Build better apps with Google</h1>
         <p class="dac-hero-description">
-        Add powerful capabilities, quickly, at low cost. Simplify development,
-        grow your user base, and monetize more effectively with Google Play services. 
-        </p>
+          Take advantage of the latest Google technologies through a single set of APIs, delivered
+          across Android devices worldwide as part of Google Play services. </p>
+          <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/">
           <span class="dac-sprite dac-auto-chevron"></span>
-          Get Started with Google Play services
+          Set up Google Play services
         </a><br>
         <a class="dac-hero-cta" href="https://developers.google.com/android/reference/">
           <span class="dac-sprite dac-auto-chevron"></span>
@@ -29,12 +31,6 @@ footer.hide=1
         </a><br>
       </div>
     </div>
-    <div class="dac-section dac-small">
-      <!--<div class="resource-widget resource-flow-layout col-16"
-           data-query="collection:google/landing/google"
-           data-cardSizes="6x2"
-           data-maxResults="6"></div>-->
-    </div>
   </div>
 </section>
 <div class="wrap dac-offset-parent">
@@ -55,14 +51,15 @@ footer.hide=1
 <section class="dac-section dac-light"><div class="wrap">
   <h1 class="dac-section-title">Google APIs and services</h1>
   <div class="dac-section-subtitle">
-    Google gives you a rich set of APIs to build with and delivers consistent services across billions of Android devices worldwide. 
+    Add the latest Google-powered features to enrich your app,
+          grow your user base, and monetize. 
   </div>
   <div class="resource-widget resource-flow-layout col-16"
        data-query="collection:google/landing/services"
        data-cardSizes="6x6"
        data-maxResults="6"></div>
   <ul class="dac-section-links">
-    <li class="dac-section-link"><a href="https://developers.google.com/">
+    <li class="dac-section-link"><a href="https://developers.google.com/android/">
       <span class="dac-sprite dac-auto-chevron"></span>
       More Google services for Android
     </a></li>
@@ -70,11 +67,19 @@ 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>
+  <div class="resource-widget resource-flow-layout col-16"
+       data-query="collection:google/landing/videos"
+       data-cardSizes="6x6"
+       data-maxResults="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">
   <h1 class="dac-section-title">Google Play developer tools</h1>
   <div class="dac-section-subtitle">
-    Scale your publishing operations, manage your catalog more easily, and build your revenue stream with in-app products and subscriptions using Google Play's developer tools. 
+    Scale your publishing, manage your catalog, and build revenue using Google Play developer tools. 
   </div>
   <div class="resource-widget resource-flow-layout col-16"
        data-query="collection:google/landing/googleplay"

docs/html/jd_collections.js

@@ -129,6 +129,14 @@ var RESOURCE_COLLECTIONS = {
       "https://developers.google.com/app-indexing/"
     ]
   },
+  "google/landing/videos": {
+    "title": "",
+    "resources": [
+      "https://www.youtube.com/watch?v=FOn64iqlphk&list=PLWz5rJ2EKKc9Qk1_iCZNbBp6adYnJf9Vf",
+      "https://www.youtube.com/watch?v=F0Kh_RnSM0w&list=PLWz5rJ2EKKc9Qk1_iCZNbBp6adYnJf9Vf",
+      "https://www.youtube.com/watch?v=fvtMtfCuEpw&list=PLWz5rJ2EKKc9Qk1_iCZNbBp6adYnJf9Vf"
+    ]
+  },
   "google/landing/googleplay": {
     "title": "",
     "resources": [
@@ -517,7 +525,7 @@ var RESOURCE_COLLECTIONS = {
   "distribute/googleplay/cardboard": {
     "title": "Google Cast",
     "resources": [
-      "https://www.google.com/get/cardboard/",
+      "https://www.google.com/get/cardboard/get-cardboard/",
       "https://developers.google.com/cardboard/android/download",
       "http://www.google.com/design/spec-vr"
     ]

docs/html/jd_extras.js

@@ -81,7 +81,7 @@ DISTRIBUTE_RESOURCES = DISTRIBUTE_RESOURCES.concat([
     "title":"Get Cardboard",
     "titleFriendly":"",
     "summary":"Get your own Cardboard, today. Buy one from a manufacturer or build your own, and start developing.",
-    "url":"https://www.google.com/get/cardboard/",
+    "url":"https://www.google.com/get/cardboard/get-cardboard/",
     "group":"",
     "keywords": ["carboard","vr"],
     "tags": [],
@@ -295,6 +295,30 @@ DISTRIBUTE_RESOURCES = DISTRIBUTE_RESOURCES.concat([
     "image":"http://i1.ytimg.com/vi/FOn64iqlphk/maxresdefault.jpg",
     "type":"video"
   },
+  {
+    "title":"Google Play Services 6.5",
+    "titleFriendly":"",
+    "summary":"Google Play services 6.5 includes new features in Google Maps, Google Drive and Google Wallet as well as the recently launched Google Fit API. ",
+    "url":"https://www.youtube.com/watch?v=fvtMtfCuEpw&list=PLWz5rJ2EKKc9Qk1_iCZNbBp6adYnJf9Vf",
+    "group":"",
+    "keywords": ["google play services"],
+    "tags": [
+    ],
+    "image":"http://i1.ytimg.com/vi/fvtMtfCuEpw/maxresdefault.jpg",
+    "type":"video"
+  },
+    {
+    "title":"Google Play Services 7.0",
+    "titleFriendly":"",
+    "summary":"Google Play services 7.0 is here! we've added the Places API, made enhancements to Location and Google Fit, and you can also remote control your Android TV through the new Nearby Connections API.",
+    "url":"https://www.youtube.com/watch?v=F0Kh_RnSM0w&list=PLWz5rJ2EKKc9Qk1_iCZNbBp6adYnJf9Vf",
+    "group":"",
+    "keywords": ["google play services"],
+    "tags": [
+    ],
+    "image":"http://i1.ytimg.com/vi/F0Kh_RnSM0w/maxresdefault.jpg",
+    "type":"video"
+  },
   {
     "title":"Running a Successful Games Business with Google",
     "titleFriendly":"",