merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
diff --git a/core/build_id.mk b/core/build_id.mk
index a933c62..ffff91e 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -13,9 +13,20 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+
+#
+# Defines branch-specific values.
+#
+
# BUILD_ID is usually used to specify the branch name
# (like "MAIN") or a branch name and a release candidate
-# (like "CRB01"). It must be a single word, and is
+# (like "TC1-RC5"). It must be a single word, and is
# capitalized by convention.
+#
+BUILD_ID := JB_MR2
-export BUILD_ID=JSR78D
+# DISPLAY_BUILD_NUMBER should only be set for development branches,
+# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for
+# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY
+# is the same as BUILD_ID
+DISPLAY_BUILD_NUMBER := true
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index 6e72a38..865e850 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -1754,10 +1754,14 @@
#qv-wrapper {
float:right;
clear:right;
- margin:-27px 0 0 20px; /* negative top-margin to counter the content-header bottom margin */
+ margin:0 0 0 20px; /* negative top-margin to counter the content-header bottom margin */
padding:0 0 20px;
}
+#tb-wrapper {
+ margin:-27px 0 0 20px; /* negative top-margin to counter the content-header bottom margin */
+}
+
#tb,
#qv {
font-size:13px;
@@ -2615,39 +2619,66 @@
background-image: url(../images/styles/disclosure_up.png);
}
-/* notice sidebox link used in Design docs */
-a.notice-developers {
+/* notice box for cross links between Design/Develop docs */
+a.notice-developers,
+a.notice-designers {
float:right;
- width:240px;
+ width:238px;
min-height:50px;
margin:0 0 20px 20px;
border:1px solid #ddd;
}
-a.notice-developers div {
+a.notice-developers div,
+a.notice-designers div {
min-height:40px;
- background:url('../images/styles/notice-developers.png') no-repeat 10px 10px;
+ background:url('../images/styles/notice-developers@2x.png') no-repeat 10px 10px;
+ background-size:40px 40px;
padding:10px 10px 10px 60px;
}
-a.notice-developers:hover {
+a.notice-designers div {
+ background:url('../images/styles/notice-designers@2x.png') no-repeat 10px 10px;
+ background-size:40px 40px;
+}
+a.notice-developers:hover,
+a.notice-designers:hover {
background:#eee;
}
-a.notice-developers h3 {
+a.notice-developers h3,
+a.notice-designers h3 {
font-size:14px;
font-weight:normal;
text-transform:uppercase;
color:#000 !important;
margin:0;
}
-a.notice-developers p {
+a.notice-developers p,
+a.notice-designers p {
margin:0;
line-height:16px;
}
-a.notice-developers.left {
+a.notice-developers.left,
+a.notice-designers.left {
margin-left:0;
float:left;
}
+/* hide nested list items; companion to hideNestedLists() */
+.hide-nested li ol,
+.hide-nested li ul {
+ display:none;
+}
+
+a.header-toggle {
+ display:block;
+ float:right;
+ text-transform:uppercase;
+ font-size:.8em !important;
+ font-weight:normal;
+ margin-top:2px;
+}
+
+
/* -----------------------------------------------
good/bad example containers
*/
diff --git a/tools/droiddoc/templates-sdk/assets/images/styles/notice-designers.png b/tools/droiddoc/templates-sdk/assets/images/styles/notice-designers.png
new file mode 100644
index 0000000..1fb22a2
--- /dev/null
+++ b/tools/droiddoc/templates-sdk/assets/images/styles/notice-designers.png
Binary files differ
diff --git a/tools/droiddoc/templates-sdk/assets/images/styles/notice-designers@2x.png b/tools/droiddoc/templates-sdk/assets/images/styles/notice-designers@2x.png
new file mode 100644
index 0000000..bc2f74b
--- /dev/null
+++ b/tools/droiddoc/templates-sdk/assets/images/styles/notice-designers@2x.png
Binary files differ
diff --git a/tools/droiddoc/templates-sdk/assets/images/styles/notice-developers.png b/tools/droiddoc/templates-sdk/assets/images/styles/notice-developers.png
index dd04606..a29c31a 100644
--- a/tools/droiddoc/templates-sdk/assets/images/styles/notice-developers.png
+++ b/tools/droiddoc/templates-sdk/assets/images/styles/notice-developers.png
Binary files differ
diff --git a/tools/droiddoc/templates-sdk/assets/images/styles/notice-developers@2x.png b/tools/droiddoc/templates-sdk/assets/images/styles/notice-developers@2x.png
new file mode 100644
index 0000000..d42f537
--- /dev/null
+++ b/tools/droiddoc/templates-sdk/assets/images/styles/notice-developers@2x.png
Binary files differ
diff --git a/tools/droiddoc/templates-sdk/assets/js/docs.js b/tools/droiddoc/templates-sdk/assets/js/docs.js
index f61cf1e..ba65e44 100644
--- a/tools/droiddoc/templates-sdk/assets/js/docs.js
+++ b/tools/droiddoc/templates-sdk/assets/js/docs.js
@@ -898,52 +898,7 @@
-
-
-
-
-
-
-/*
-
-REMEMBER THE PREVIOUS PAGE FOR EACH TAB
-
-function loadLast(cookiePath) {
- var location = window.location.href;
- if (location.indexOf("/"+cookiePath+"/") != -1) {
- return true;
- }
- var lastPage = readCookie(cookiePath + "_lastpage");
- if (lastPage) {
- window.location = lastPage;
- return false;
- }
- return true;
-}
-
-
-
-$(window).unload(function(){
- var path = getBaseUri(location.pathname);
- if (path.indexOf("/reference/") != -1) {
- writeCookie("lastpage", path, "reference", null);
- } else if (path.indexOf("/guide/") != -1) {
- writeCookie("lastpage", path, "guide", null);
- } else if ((path.indexOf("/resources/") != -1) || (path.indexOf("/training/") != -1)) {
- writeCookie("lastpage", path, "resources", null);
- }
-});
-
-*/
-
-
-
-
-
-
-
-
-
+/* MISC LIBRARY FUNCTIONS */
@@ -970,9 +925,6 @@
}
-
-
-
function buildToggleLists() {
$(".toggle-list").each(
function(i) {
@@ -983,7 +935,19 @@
-
+function hideNestedItems(list, toggle) {
+ $list = $(list);
+ // hide nested lists
+ if($list.hasClass('showing')) {
+ $("li ol", $list).hide('fast');
+ $list.removeClass('showing');
+ // show nested lists
+ } else {
+ $("li ol", $list).show('fast');
+ $list.addClass('showing');
+ }
+ $(".more,.less",$(toggle)).toggle();
+}
