merge in jb-release history after reset to jb-dev
diff --git a/core/build_id.mk b/core/build_id.mk
index 958ea47..40bb35d 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -1,4 +1,3 @@
-
#
# Copyright (C) 2008 The Android Open Source Project
#
@@ -14,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 := MASTER
-export BUILD_ID=JRN83D
+# 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 75e8dfd..43f20f9 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -20,8 +20,8 @@
/* turned off ligatures due to bug 5945455 */ }
body {
- color: #444;
- font: 14px/21px Roboto, sans-serif;
+ color: #222;
+ font: 14px/19px Roboto, sans-serif;
font-weight: 400;
letter-spacing:.1;
padding:0 10px; }
@@ -948,7 +948,7 @@
}
strong, b {
font-weight:bold;
- color: #444;
+ color: #222;
}
table {
border-collapse: collapse;
@@ -1068,7 +1068,7 @@
-webkit-appearance: none;
background: white url('../images/arrows-up-down.png') right center no-repeat;
height: 30px;
- color: #444;
+ color: #222;
line-height: normal;
padding: 5px;
width: 230px;
@@ -1280,7 +1280,7 @@
background-position: -8px 0
}
.search form input:focus {
- color: #444;
+ color: #222;
font-weight: bold;
outline:0;
}
@@ -1310,7 +1310,7 @@
margin: 0 10px 10px 0
}
.search-dropdown h6 {
- color: #444;
+ color: #222;
margin: 0;
line-height: normal
}
@@ -1682,7 +1682,7 @@
-webkit-appearance: none;
background: #f3f3f3 url(../images/arrows-up-down.png) right center no-repeat;
height: 30px;
- color: #444;
+ color: #222;
line-height: normal;
padding: 5px;
width: 130px;
@@ -1701,7 +1701,7 @@
.article form input[type='text'], .article form textarea {
border: 1px solid #ebebeb;
border-top-color: #dcdcdc;
- color: #444;
+ color: #222;
line-height: normal;
padding: 6px 10px;
width: 300px;
@@ -1828,7 +1828,7 @@
#packages-nav li a, #packages-nav li a:active, #packages-nav li a:visited,
#classes-nav li li a, #classes-nav li li a:active, #classes-nav li li a:visited,
#nav-tree li a, #nav-tree li a:active, #nav-tree li a:visited {
- color: #444;
+ color: #222;
font-weight: normal;
}
#packages-nav li a, #packages-nav li a:active, #packages-nav li a:visited,
@@ -1858,7 +1858,7 @@
#nav-swap a {
display:inline-block;
height:100%;
- color: #444;
+ color: #222;
font-size: 12px;
padding: 5px 0 5px 5px;
}
@@ -1932,7 +1932,7 @@
}
#nav-tree a.nolink {
- color: #444;
+ color: #222;
text-decoration: none;
}
@@ -1969,7 +1969,7 @@
font-weight: bold;
}
#api-info-block a, #api-info-block a:active, #api-info-block a:visited {
- color: #444;
+ color: #222;
}
#api-info-block a:hover, #api-info-block a:focus {
color: #33B5E5;
@@ -2013,7 +2013,7 @@
-moz-appearance:none;
-webkit-appearance: none;
background: transparent url(../images/arrows-up-down.png) 23px 5px no-repeat;
- color: #444;
+ color: #222;
height: 19px;
line-height: 19px;
padding: 0;
@@ -2412,7 +2412,7 @@
line-height: 36px;
padding: 0 15px;
margin-right: 2px;
- color: #444;
+ color: #222;
-moz-border-radius-topleft: 2px;
-moz-border-radius-topright: 2px;
-moz-border-radius-bottomright: px;
@@ -2592,7 +2592,7 @@
font-weight:bold;
font-size:inherit;
float:none;
- color:#444;
+ color:#222;
padding:0;
margin:0;
}
@@ -2854,7 +2854,7 @@
#search_filtered li a {
padding:0 5px;
- color:#444 !important;
+ color:#222 !important;
}
#search_filtered .jd-selected {
@@ -3280,7 +3280,7 @@
}
#quicknav ul li ul li a {
- color:#444444;
+ color:#222;
}
#quicknav ul li li ul,
@@ -3401,7 +3401,7 @@
}
.search form input:focus {
- color: #444;
+ color: #222;
font-weight: bold
}
@@ -3509,7 +3509,7 @@
.morehover ul li.active a,
.morehover ul li.active a:hover {
- color:#444 !important;
+ color:#222 !important;
}
.morehover ul li.active img {
diff --git a/tools/droiddoc/templates-sdk/assets/css/home.css b/tools/droiddoc/templates-sdk/assets/css/home.css
index d5b95fc..5b7e048 100644
--- a/tools/droiddoc/templates-sdk/assets/css/home.css
+++ b/tools/droiddoc/templates-sdk/assets/css/home.css
@@ -13,15 +13,19 @@
float: left;
text-align: center;
vertical-align: center;
- margin: 0 0 0 25px;
+ margin: 0 0 0 35px;
}
.slideshow-home .content-right {
- width: 290px;
- float: left;
- margin: 100px 0 0 0;
+ margin: 80px 0 0 0;
}
.slideshow-home .content-right p {
- margin-bottom: 30px;
+ margin-bottom: 10px;
+}
+.slideshow-home .content-right p:last-child {
+ margin-top: 15px;
+}
+.slideshow-home .content-right h1 {
+ padding:0;
}
.slideshow-home .item {
height: 500px;
diff --git a/tools/droiddoc/templates-sdk/sdkpage.cs b/tools/droiddoc/templates-sdk/sdkpage.cs
index 38fb67b..17c1354 100644
--- a/tools/droiddoc/templates-sdk/sdkpage.cs
+++ b/tools/droiddoc/templates-sdk/sdkpage.cs
@@ -77,7 +77,7 @@
?>
- <table class="download">
+ <table class="download" id="download-table">
<tr>
<th>Platform</th>
<th>Package</th>