Merge "fix z-order of hangouts to avoid clobbering the search suggest" into lmp-dev
diff --git a/tools/droiddoc/templates-sdk/assets/js/docs.js b/tools/droiddoc/templates-sdk/assets/js/docs.js
index 3d278c3..a556f4f 100644
--- a/tools/droiddoc/templates-sdk/assets/js/docs.js
+++ b/tools/droiddoc/templates-sdk/assets/js/docs.js
@@ -2538,6 +2538,9 @@
/* Adjust the scroll position to account for sticky header, only if the hash matches an id.
This does not handle <a name=""> tags. Some CSS fixes those, but only for reference docs. */
function offsetScrollForSticky() {
+ // Ignore if there's no search bar (some special pages have no header)
+ if ($("#search-container").length < 1) return;
+
var hash = escape(location.hash.substr(1));
var $matchingElement = $("#"+hash);
// Sanity check that there's an element with that ID on the page
diff --git a/tools/droiddoc/templates-sdk/docpage.cs b/tools/droiddoc/templates-sdk/docpage.cs
index 7d872bc..7cd9d43 100644
--- a/tools/droiddoc/templates-sdk/docpage.cs
+++ b/tools/droiddoc/templates-sdk/docpage.cs
@@ -194,10 +194,10 @@
<?cs include:"trailer.cs" ?>
<script src="https://developer.android.com/ytblogger_lists_unified.js" type="text/javascript"></script>
- <script src="<?cs var:toroot ?>jd_lists_unified.js?v=2" type="text/javascript"></script>
- <script src="<?cs var:toroot ?>jd_extras.js?v=3" type="text/javascript"></script>
- <script src="<?cs var:toroot ?>jd_collections.js?v=3" type="text/javascript"></script>
- <script src="<?cs var:toroot ?>jd_tag_helpers.js?v=2" type="text/javascript"></script>
+ <script src="<?cs var:toroot ?>jd_lists_unified.js?v=3" type="text/javascript"></script>
+ <script src="<?cs var:toroot ?>jd_extras.js?v=4" type="text/javascript"></script>
+ <script src="<?cs var:toroot ?>jd_collections.js?v=4" type="text/javascript"></script>
+ <script src="<?cs var:toroot ?>jd_tag_helpers.js?v=3" type="text/javascript"></script>
</body>
</html>