Merge "cherrypick from Change-Id: I2722879ee7f246e34acca7fd9fb84acff4e8540d docs: some css for android u and javascript"
diff --git a/tools/droiddoc/templates-sdk/assets/android-developer-docs.css b/tools/droiddoc/templates-sdk/assets/android-developer-docs.css
index 22d010a..3af4eb1 100644
--- a/tools/droiddoc/templates-sdk/assets/android-developer-docs.css
+++ b/tools/droiddoc/templates-sdk/assets/android-developer-docs.css
@@ -1005,6 +1005,82 @@
/* End sidebox sidebar element styles */
+/* BEGIN developer training bar styles */
+
+div#tb-wrapper {
+ float: right;
+ width:480px; /* +25px padding = 505 */
+ background-color:#fff;
+ margin:-48px 0 2px 0;
+ padding:0 0 20px 25px;
+}
+
+div#tb {
+ margin:0;
+ padding:15px;
+ width:450px; /* +15px padding = 480 */
+ font-size:.9em;
+ background:#e9e9e9;
+ border-radius:5px;
+ -moz-border-radius:5px;
+ -webkit-border-radius:5px;
+}
+
+div#tb h2 {
+ font-size:1.3em;
+ font-weight:bold;
+ margin:12px 0 .25em 0;
+ padding:10px 0;
+ background-color:transparent;
+ border:none;
+}
+
+div.download-box a.button {
+ color:#eee;
+ font-weight:bold;
+ font-size:1.1em;
+ text-decoration:none;
+ height:40px;
+ line-height:40px;
+ padding:5px 10px;
+ border:2px solid #99be27;
+ border-radius:5px;
+ -moz-border-radius:5px;
+ -webkit-border-radius:5px;
+ /* thanks http://www.colorzilla.com/gradient-editor/ */
+ background: #aed33c; /* Old browsers */
+ background: -moz-linear-gradient(top, #aed33c 20%, #a1c730 80%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(20%,#aed33c), color-stop(80%,#a1c730)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #aed33c 20%,#a1c730 80%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #aed33c 20%,#a1c730 80%); /* Opera11.10+ */
+ background: -ms-linear-gradient(top, #aed33c 20%,#a1c730 80%); /* IE10+ */
+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#AED33C', endColorstr='#A1C730',GradientType=0 ); /* IE6-9 */
+ background: linear-gradient(top, #aed33c 20%,#a1c730 80%); /* W3C */
+}
+
+div.download-box a.button:hover {
+ border:2px solid #b2d841;
+}
+
+div.download-box a.button:active {
+ background: #a1c730; /* Old browsers */
+ background: -moz-linear-gradient(top, #a1c730 15%, #aed33c 70%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(15%,#a1c730), color-stop(70%,#aed33c)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #a1c730 15%,#aed33c 70%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #a1c730 15%,#aed33c 70%); /* Opera11.10+ */
+ background: -ms-linear-gradient(top, #a1c730 15%,#aed33c 70%); /* IE10+ */
+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#a1c730', endColorstr='#aed33c',GradientType=0 ); /* IE6-9 */
+ background: linear-gradient(top, #a1c730 15%,#aed33c 70%); /* W3C */
+}
+
+div.download-box p.filename {
+ font-size:0.8em;
+ color:#888;
+ margin:0 0 0 12px;
+}
+
+/* End developer training bar */
+
/* BEGIN image and caption styles (originally for UI Guidelines docs) */
table.image-caption {
diff --git a/tools/droiddoc/templates-sdk/assets/android-developer-docs.js b/tools/droiddoc/templates-sdk/assets/android-developer-docs.js
index e353236..153f5e0 100644
--- a/tools/droiddoc/templates-sdk/assets/android-developer-docs.js
+++ b/tools/droiddoc/templates-sdk/assets/android-developer-docs.js
@@ -143,7 +143,8 @@
cookiePath = "guide_";
} else if (location.href.indexOf("/sdk/") != -1) {
cookiePath = "sdk_";
- } else if (location.href.indexOf("/resources/") != -1) {
+ } else if ((location.href.indexOf("/resources/") != -1) ||
+ (location.href.indexOf("/training/") != -1)) {
cookiePath = "resources_";
}
@@ -251,6 +252,8 @@
firstSlashPos = fullPageName.indexOf("/sdk/");
} else if (fullPageName.indexOf("/resources/") != -1) {
firstSlashPos = fullPageName.indexOf("/resources/");
+ } else if (fullPageName.indexOf("/training/") != -1) {
+ firstSlashPos = fullPageName.indexOf("/training/");
}
if (lastSlashPos == (fullPageName.length - 1)) { // if the url ends in slash (add 'index.html')
fullPageName = fullPageName + "index.html";