am 08710f1b: Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.

* commit '08710f1b69e2188a439b54f1ae59a574f71681d0':
  Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.

5 files changed, 186 insertions, 65 deletions

diff --git a/docs/html/distribute/googleplay/families/about.jd b/docs/html/distribute/googleplay/families/about.jd
index 38738b1..a3ef157 100644
--- a/docs/html/distribute/googleplay/families/about.jd
+++ b/docs/html/distribute/googleplay/families/about.jd
@@ -7,81 +7,134 @@ page.tags="families"
 @jd:body
 
 <p>
-  If you've built great apps designed for kids or families, the family discovery experience
-  on Google Play is a great way to surface them to parents.
+  If you've built great apps designed for kids or families, the family
+  discovery experience on Google Play is a great way to surface them to
+  parents.
 </p>
 
-<p>Developers are invited to opt-in these apps and games to the new Designed for
+<p>
+  Developers are invited to opt-in these apps and games to the new Designed for
   Families program. Apps that meet the <a href=
   "https://support.google.com/googleplay/android-developer/answer/6184502">program
-  requirements</a> will be featured through Google Play's family-friendly browse
-  and search experiences so that parents can find suitable, trusted, high-quality
-  apps and games more easily.
+  requirements</a> will be featured through Google Play's family-friendly
+  browse and search experiences so that parents can find suitable, trusted,
+  high-quality apps and games more easily.
 </p>
 
-<img src="{@docRoot}distribute/images/about-dff-sm.jpg">
+<div class="figure-center">
+<iframe width="640" height="360" src="https://www.youtube.com/embed/QDM52bblwlg?rel=0&amp;controls=0&amp;showinfo=0"
+frameborder="0" allowfullscreen></iframe>
+</div>
 
 <p>
-Opt-in your apps and games to Designed for Families from the <strong>All Applications</strong> page
-in the Developer Console, under <strong>Pricing and Distribution</strong>. For more information on
-  opting-in, visit the Google Play Developer <a href="https://support.google.com/googleplay/android-developer/answer/6231938">Help Center</a>. 
+  Opt-in your apps and games to Designed for Families from the <strong>All
+  Applications</strong> page in the <a href=
+  "https://play.google.com/apps/publish/">Developer Console</a>, under
+  <strong>Pricing and Distribution</strong>. For more information on opting-in,
+  visit the Google Play Developer <a href=
+  "https://support.google.com/googleplay/android-developer/answer/6231938">Help
+  Center</a>.
 </p>
 
 
 <h2 id="benefits">Benefits</h2>
 
-    <div class="figure" style="width:300px;">
+ <div class="figure" style="width:300px;">
+  <img src="{@docRoot}images/distribute/dff-browse.png" style="width:300px">
+  <p class="figure-caption" style="text-align:center">
+    New browsing categories give you improved visibility to parents.
+  </p>
+</div>
 
-     <img src="{@docRoot}images/distribute/dff-browse.png" style="width:300px">
-     <p class="figure-caption" style="text-align:center">New browsing categories give you improved visibility to parents.</p>
-   </div>
-   
 <p>
-Designed for Families expands the visibility of your family content on Google Play, helping parents easily find your family-friendly apps and games throughout the store. And new features create a trusted environment that empowers parents to make informed desicions and engage with your content.</p>
-
-
-
-
-      <h3>Search</h3>
-        <p>Only apps and games opted-in to the Designed for Families program will show up in searches initiated from the Family section in Apps Home. They’ll also be more visible when users search for family or kid related content from anywhere in the Play store.</p>
-  
-      <h3>Browse</h3>
-        <p>The Family star button on Apps and Games Home points to an enhanced discovery experience for parents looking for family appropriate content. The new Family section includes uniquely merchandised content, new categories, and age-based browsing. Participating apps will receive this additional visibility on top of their existing categories, rankings, and reviews elsewhere on the Google Play store.</p>
-
-
-
-
-      <h3>Character pages</h3>
+  Designed for Families expands the visibility of your family content on Google
+  Play, helping parents easily find your family-friendly apps and games
+  throughout the store. And new features create a trusted environment that
+  empowers parents to make informed desicions and engage with your content.
+</p>
+<h3>
+  Search
+</h3>
 
+<p>
+  Only apps and games opted-in to the Designed for Families program will show
+  up in searches initiated from the Family section in Apps Home. They’ll also
+  be more visible when users search for family or kid related content from
+  anywhere in the Play store.
+</p>
 
-    <div class="figure" style="width:300px;">
+<h3>
+  Browse
+</h3>
 
-     <img src="{@docRoot}images/distribute/dff-character-group.png" style="width:500px">
-     <p class="figure-caption" style="text-align:center">Character pages let parents discover your content based on familiar brands and characters.</p>
-   </div>
+<p>
+  The Family star button on Apps and Games Home points to an enhanced discovery
+  experience for parents looking for family appropriate content. The new Family
+  section includes uniquely merchandised content, new categories, and age-based
+  browsing. Participating apps will receive this additional visibility on top
+  of their existing categories, rankings, and reviews elsewhere on the Google
+  Play store.
+</p>
 
+<h3>
+  Character pages
+</h3>
 
-      <p>Parents can now discover content for popular characters from around the globe in one place, including apps, games, movies, tv shows, books, and even music. This provides a powerful way for parents to discover content from familiar  brands and beloved characters, and allows you to reach a highly relevant and targeted audience. </p>
+<div class="figure" style="width:300px;">
+  <img src="{@docRoot}images/distribute/dff-character-group.png" style=
+  "width:500px">
+  <p class="figure-caption" style="text-align:center">
+    Character pages let parents discover your content based on familiar brands
+    and characters.
+  </p>
+</div>
 
-      <h3>Merchandising</h3>
-        <p>The family sections include their own merchandised collections. The themed collections on these pages are curated to ensure quality and limited only to content accepted into the Designed for Families program.</p>
+<p>
+  Parents can now discover content for popular characters from around the globe
+  in one place, including apps, games, movies, tv shows, books, and even music.
+  This provides a powerful way for parents to discover content from familiar
+  brands and beloved characters, and allows you to reach a highly relevant and
+  targeted audience.
+</p>
 
-      <h3>Badging</h3>
-        <p>Apps participating in Designed for Families are marked with the family star badge, which reflects the target age you select for your apps and serves as a signal of quality for parents.</p>
+<h3>
+  Merchandising
+</h3>
 
+<p>
+  The family sections include their own merchandised collections. The themed
+  collections on these pages are curated to ensure quality and limited only to
+  content accepted into the Designed for Families program.
+</p>
 
-    <div class="figure" style="width:300px;">
+<h3>
+  Badging
+</h3>
 
-     <img src="{@docRoot}images/distribute/dff-badging.png" style="width:300px">
-     <p class="figure-caption" style="text-align:center">Participating apps are marked with the family star badge.</p>
-   </div>
+<p>
+  Apps participating in Designed for Families are marked with the family star
+  badge, which reflects the target age you select for your apps and serves as a
+  signal of quality for parents.
+</p>
 
+<div class="figure" style="width:300px;">
+  <img src="{@docRoot}images/distribute/dff-badging.png" style="width:300px">
+  <p class="figure-caption" style="text-align:center">
+    Participating apps are marked with the family star badge.
+  </p>
+</div>
 
-<h2 id="elibibility">Eligibility</h2>
+<h2 id="elibibility">
+  Eligibility
+</h2>
 
 <p>
-The Designed for Families program is designed to be inclusive of apps that are made for kids as well as those that can be enjoyed by the entire family. General audience apps that have no specific benefit or relevance for audiences under the age of thirteen will not be accepted into the program. To participate, there are specific guidelines and policies your apps need to meet, which are assessed in an app content review.
-
+  The Designed for Families program is designed to be inclusive of apps that
+  are made for kids as well as those that can be enjoyed by the entire family.
+  General audience apps that have no specific benefit or relevance for
+  audiences under the age of thirteen will not be accepted into the program. To
+  participate, there are specific guidelines and policies your apps need to
+  meet, which are assessed in an app content review.
 </p>
 
 <p>
@@ -102,12 +155,19 @@ The Designed for Families program is designed to be inclusive of apps that are m
 </p>
 
 <p>
-To learn how to opt-in and find more details about the program, visit the Google Play Developer <a href="https://support.google.com/googleplay/android-developer/answer/6231938">Help Center</a>.
+  To learn how to opt-in and find more details about the program, visit the
+  Google Play Developer <a href=
+  "https://support.google.com/googleplay/android-developer/answer/6231938">Help
+  Center</a>.
+</p>
 
-<h2 id="contact">Stay in Touch</h2>
+<h2 id="contact">
+  Stay in Touch
+</h2>
 
-<p>If you'd like to receive occasional emails with news relating to the Designed for Families
-program and Google Play opportunities, sign up using the <a
-href="https://docs.google.com/forms/d/1EtvUWqlkxS6RxHJjeI-3-7uzdbIZx6n9Cocy2D369B8/viewform">Designed
-for Families Interest Form</a>
+<p>
+  If you'd like to receive occasional emails with news relating to the Designed
+  for Families program and Google Play opportunities, sign up using the
+  <a href="https://docs.google.com/forms/d/1EtvUWqlkxS6RxHJjeI-3-7uzdbIZx6n9Cocy2D369B8/viewform">
+  Designed for Families Interest Form</a>
 </p>
\ No newline at end of file
diff --git a/docs/html/google/index.jd b/docs/html/google/index.jd
index 2d3ee05..a2a6c50 100644
--- a/docs/html/google/index.jd
+++ b/docs/html/google/index.jd
@@ -72,6 +72,7 @@ footer.hide=1
   <h2 class="norule">Videos</h2>
   <div class="resource-widget resource-flow-layout col-16"
        data-query="collection:google/landing/videos"
+       data-sortOrder="-timestamp"
        data-cardSizes="6x6"
        data-maxResults="3"></div>
   </div>
diff --git a/docs/html/jd_collections.js b/docs/html/jd_collections.js
index 073feb8..cac93af 100644
--- a/docs/html/jd_collections.js
+++ b/docs/html/jd_collections.js
@@ -132,6 +132,7 @@ var RESOURCE_COLLECTIONS = {
   "google/landing/videos": {
     "title": "",
     "resources": [
+      "https://www.youtube.com/watch?v=M3Udfu6qidk&list=PLWz5rJ2EKKc9Qk1_iCZNbBp6adYnJf9Vf",
       "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"
diff --git a/docs/html/jd_extras.js b/docs/html/jd_extras.js
index 90a9875..87581e9 100644
--- a/docs/html/jd_extras.js
+++ b/docs/html/jd_extras.js
@@ -294,10 +294,23 @@ DISTRIBUTE_RESOURCES = DISTRIBUTE_RESOURCES.concat([
     "image":"http://i1.ytimg.com/vi/K2dodTXARqc/maxresdefault.jpg",
     "type":"video"
   },
+
+  {
+    "title":"Google Play Services 7.5",
+    "titleFriendly":"",
+    "summary":"This update brings App Invites, topics to GCM, GCMNetworkManager, Cast Remote Display API, Smart Lock for Passwords, Maps API for Android Wear, Google Fit extensions and more.",
+    "url":"https://www.youtube.com/watch?v=M3Udfu6qidk&list=PLWz5rJ2EKKc9Qk1_iCZNbBp6adYnJf9Vf",
+    "group":"",
+    "keywords": ["google play services"],
+    "tags": [
+    ],
+    "image":"http://i1.ytimg.com/vi/M3Udfu6qidk/maxresdefault.jpg",
+    "type":"video"
+  },
   {
     "title":"Google Play Services 7.3",
     "titleFriendly":"",
-    "summary":"Google Play Services 7.3 brings a ton of great new features to help you BUILD BETTER APPS! This update brings the ability to connect multiple wearables simultaneously to a single phone.",
+    "summary":"This update brings the ability to connect multiple wearables simultaneously to a single phone. There are also some great new updates to Google Fit, including nutrition types, and to Location.",
     "url":"https://www.youtube.com/watch?v=FOn64iqlphk&list=PLWz5rJ2EKKc9Qk1_iCZNbBp6adYnJf9Vf",
     "group":"",
     "keywords": ["google play services"],
diff --git a/docs/html/tools/data-binding/guide.jd b/docs/html/tools/data-binding/guide.jd
index 71409e4..ec16c6b 100644
--- a/docs/html/tools/data-binding/guide.jd
+++ b/docs/html/tools/data-binding/guide.jd
@@ -2,15 +2,6 @@ page.title=Data Binding Guide
 page.tags="databinding", "layouts"
 @jd:body
 
-<div class="wrap">
-<p class="caution" style="background-color:#fffdeb;">
-The <strong>Android Data Binding Library</strong> is available as a <strong>developer
-preview</strong>. Expression syntax and behaviors may change prior to the full release
-of the library, currently planned for Q3 2015. If you have feedback or want to report
-issues, please use the <a href="https://code.google.com/p/android-developer-preview/">issue
-tracker</a>. Stay tuned for more information about Data Binding and examples of how to use it. </a>
-</p>
-</div>
 <div id="qv-wrapper">
   <div id="qv">
     <h2>
@@ -140,17 +131,72 @@ tracker</a>. Stay tuned for more information about Data Binding and examples of
   </div><!-- qv -->
 </div><!-- qv-wrapper -->
 
-
 <p>
   This document explains how to use the Data Binding Library to write
   declarative layouts and minimize the glue code necessary to bind your
   application logic and layouts.
 </p>
 
+<p>The Data Binding Library offers both flexibility and broad comnpatibility
+&mdash; it's a support library, so you can use it with all Android platform
+versions back to <strong>Android 2.1</strong> (API level 7+).</p>
+
+<p>Android Studio <strong>1.3.0-beta1</strong> or higher is required.</p>
+
+<h4>Beta release</h4>
+
+<div class="caution">
+  <p>Please note that the Data Binding library is a <strong>beta release</strong>.
+  While Data Binding is in beta, developers should be aware of the following
+  caveats:</p>
+  <ul>
+    <li>
+    This is a beta release of the feature intended to generate developer
+    feedback. It might contain bugs, and it might not work for your use case,
+    so use it at your own risk. That said, we do want your feedback! Please
+    let us know what is or isn’t working for you using the <a
+    href="https://code.google.com/p/android-developer-preview/">issue
+    tracker</a>. 
+    </li>
+    <li>
+    The Data Binding library beta release is subject to significant changes,
+    including those which are not source code compatible with your app. That is,
+    significant rework may be required to take updates to the library in the future.
+    </li>
+    <li>
+    Developers should feel free to publish apps built with the Data Binding
+    library beta release, with the caveats that the standard Android SDK and
+    Google Play terms of service apply, and it’s always a great idea to test your
+    app thoroughly when adopting new libraries or tools.
+    </li>
+    <li>
+    We’re just getting started with Android Studio support at this time.
+    Further Android Studio support will come in the future.
+    </li>
+    <li>
+    By using the Data Binding library beta release, you acknowledge these 
+    caveats.</li>
+  </ul>
+</div>
+
+<h2 id="build_environment">
+  Build Environment
+</h2>
+
+<p>To get started with Data Binding, download the library from the Support
+repository in the Android SDK manager. </p>
+
+<p>Make sure you are using a compatible version of Android Studio.
+The Data Binding plugin for Android Studio requires Android Studio <strong>1.3.0-beta1
+or higher</strong>.</p>
 <h2 id="build_environment">
   Build Environment
 </h2>
 
+<p>To get started with Data Binding, download the library from the Support repository in the Android SDK manager. </p>
+
+<p>Make sure you are using a <strong>compatible version of Android Studio</strong>. The Data Binding plugin for Android Studio requires <strong>Android 1.3.0-beta1 or higher</strong>.</p>
+
 <p>
   <strong>Setting Up Work Environment:</strong>
 </p>
@@ -391,7 +437,7 @@ ListItemBinding binding = DataBindingUtil.<em>inflate</em>(layoutInflater, R.lay
     &lt;<strong>variable name="userList" type="List&amp;lt;User&gt;"</strong>/&gt;
     &lt;/<strong>data</strong>&gt;
 </pre>
-<p class="note">
+<p class="caution">
   <strong>Note</strong>: Android Studio does not yet handle imports so the
   autocomplete for imported variables may not work in your IDE. Your
   application will still compile fine and you can work around the IDE issue by
@@ -771,7 +817,7 @@ android:text="&commat;{&commat;plurals/banana(bananaCount)}"</strong>
   Have an orange
   Have %d oranges
 
-android:text="<strong>&commat{&commatplurals/orange(orangeCount, orangeCount)}</strong>"
+android:text="<strong>&commat;{&commat;plurals/orange(orangeCount, orangeCount)}</strong>"
 </pre>
 <p>
   Some resources require explicit type evaluation.