Merge "add jdwp tests to CTS. Bug: 8538755"
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index 28dced5..ddd98e2 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -5260,6 +5260,9 @@
-o-transition: opacity 0.5s;
transition: opacity 0.5s;
}
+.static .card-bg:after {
+ display:none;
+}
.card-bg .card-section-icon {
position: absolute;
top: 50%;
@@ -5405,7 +5408,7 @@
.resource-flow-layout:after {
content: ".";
display: block;
- height: 10;
+ height: 0;
position:relative;
clear: both;
visibility: hidden;
@@ -5413,6 +5416,9 @@
.resource-card:hover {
cursor: pointer;
}
+.static .resource-card:hover {
+ cursor: auto;
+}
.resource-card:hover .card-bg:after {
opacity: 0;
}
@@ -6329,6 +6335,17 @@
display: none;
}
+
+/* Override to show the description instead of the content section */
+.no-section .resource-card-3x2 > .card-info .section,
+.no-section .resource-card-6x2 > .card-info .section {
+ display: none;
+}
+.no-section .resource-card-3x2 > .card-info .description,
+.no-section .resource-card-6x2 > .card-info .description {
+ display: block;
+}
+
/* 1/2 row items */
.resource-card-3x3 > .card-bg, .resource-card-6x3 > .card-bg, .resource-card-9x3 > .card-bg, .resource-card-12x3 > .card-bg, .resource-card-15x3 > .card-bg, .resource-card-18x3 > .card-bg {
left: 0;
@@ -6425,6 +6442,8 @@
border-top-color: #7e3794 !important;
}
+
+
/**
* UTILITIES
*/
@@ -6676,30 +6695,30 @@
}
.landing-primary {
- background-color: hsl(8, 70%, 54%); /* #dc4b35 */
+ background-color: hsl(8, 70%, 44%);
color: #f8f8f8;
}
.landing-button.landing-primary:hover {
- background-color: hsl(8, 70%, 44%); /* #bf3722 */
-}
-
-.landing-button.landing-primary:active {
- background-color: hsl(8, 70%, 36%); /* # */
-}
-
-.landing-button.landing-secondary {
- background-color: hsl(8, 70%, 44%);
-}
-
-.landing-button.landing-secondary:hover {
background-color: hsl(8, 70%, 36%);
}
-.landing-button.landing-secondary:active {
+.landing-button.landing-primary:active {
background-color: hsl(8, 70%, 30%);
}
+.landing-button.landing-secondary {
+ background-color: #2faddb;
+}
+
+.landing-button.landing-secondary:hover {
+ background-color: #09c;
+}
+
+.landing-button.landing-secondary:active {
+ background-color: #3990ab;
+}
+
a.landing-button,
a.landing-button:hover,
a.landing-button:visited {
@@ -7134,7 +7153,6 @@
.actions-bar {
background: #9acd00;
margin: 0 -10px;
- margin-top:-20px;
text-align: center;
}
@@ -7143,7 +7161,7 @@
text-align: justify;
font-size: 0.1px;
line-height: 0.1px;
- margin: 0 10px;
+ margin: 0 10px 0 0;
}
.actions-bar .actions:after {
diff --git a/tools/droiddoc/templates-sdk/assets/js/docs.js b/tools/droiddoc/templates-sdk/assets/js/docs.js
index 42cd29e..f6c12b2 100644
--- a/tools/droiddoc/templates-sdk/assets/js/docs.js
+++ b/tools/droiddoc/templates-sdk/assets/js/docs.js
@@ -4018,9 +4018,11 @@
var $this = $(this);
var remainingHeight = $this.parent().parent().height();
$this.parent().siblings().each(function ()
- {
- var h = $(this).height();
- remainingHeight = remainingHeight - h;
+ {
+ if ($(this).is(":visible")) {
+ var h = $(this).height();
+ remainingHeight = remainingHeight - h;
+ }
});
adjustedRemainingHeight = ((remainingHeight)/lineHeight>>0)*lineHeight