Merge "Add screenrecord"
diff --git a/core/definitions.mk b/core/definitions.mk
index 4a0a620..ecb638b 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2159,6 +2159,9 @@
# when requested.
include $(BUILD_SYSTEM)/distdir.mk
+# Include any vendor specific definitions.mk file
+-include $(TOPDIR)vendor/*/build/core/definitions.mk
+
# broken:
# $(foreach file,$^,$(if $(findstring,.a,$(suffix $file)),-l$(file),$(file)))
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index 0c12340..3bfb687 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -2664,6 +2664,10 @@
margin:0 0 20px 20px;
border:1px solid #ddd;
}
+a.notice-developers.wide,
+a.notice-designers.wide {
+ width:278px;
+}
a.notice-developers div,
a.notice-designers div {
min-height:40px;
diff --git a/tools/droiddoc/templates-sdk/assets/js/docs.js b/tools/droiddoc/templates-sdk/assets/js/docs.js
index 2d72ed5..8fd442c 100644
--- a/tools/droiddoc/templates-sdk/assets/js/docs.js
+++ b/tools/droiddoc/templates-sdk/assets/js/docs.js
@@ -819,13 +819,18 @@
if ($nav.is(':visible')) {
var $selected = $(".selected", $nav);
- if ($selected.length == 0) return;
-
- var selectedOffset = $selected.position().top;
- if (selectedOffset + 90 > $nav.height()) { // add 90 so that we scroll up even
- // if the current item is close to the bottom
- api.scrollTo(0, selectedOffset - ($nav.height() / 4), false); // scroll the item into view
- // to be 1/4 of the way from the top
+ if ($selected.length == 0) {
+ // If no selected item found, exit
+ return;
+ }
+
+ var selectedOffset = $selected.offset().top; // measure offset from top, relative to entire page
+ if (selectedOffset > $nav.height() * .8) { // multiply nav height by .8 so we move up any
+ // items more than 80% down the nav
+ // scroll the item up by an amount 125px less than the window height (account for site header)
+ // and then multiply nav height by .8 to match the 80% threshold used above
+ api.scrollTo(0, selectedOffset - 125 - ($nav.height() * .8), false);
+
}
}
}