am f1534b62: Merge "Added generic hook for loading vendor specific defintions"
* commit 'f1534b6292a609bb5f55c4a617f3cd1054f90a81':
Added generic hook for loading vendor specific defintions
diff --git a/core/definitions.mk b/core/definitions.mk
index bfb1330..3d19e72 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1999,6 +1999,7 @@
###########################################################
## Define device-specific radio files
###########################################################
+INSTALLED_RADIOIMAGE_TARGET :=
# Copy a radio image file to the output location, and add it to
# INSTALLED_RADIOIMAGE_TARGET.
diff --git a/core/main.mk b/core/main.mk
index 6a077e4..3a432de 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -828,6 +828,10 @@
$(INSTALLED_FACTORY_BUNDLE_TARGET) \
)
+ # Put a copy of the radio/bootloader files in the dist dir.
+ $(foreach f,$(INSTALLED_RADIOIMAGE_TARGET), \
+ $(call dist-for-goals, droidcore, $(f)))
+
ifneq ($(TARGET_BUILD_PDK),true)
$(call dist-for-goals, droidcore, \
$(APPS_ZIP) \
diff --git a/core/pathmap.mk b/core/pathmap.mk
index 09f912e..7024e3e 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -115,7 +115,6 @@
v7/gridlayout \
v7/appcompat \
v7/mediarouter \
- v8/renderscript \
v13
#
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index 91b0f59..0c12340 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -90,7 +90,7 @@
outline:none;
width:auto;
margin: 20px 0 0; }
-
+
#devdoc-nav h2 {
border:0;
}
@@ -99,7 +99,7 @@
position: fixed;
margin:0;
top: 20px; }
-
+
#devdoc-nav span.small {
font-size:12px;
font-weight:normal;
@@ -116,7 +116,7 @@
a:focus,
a:active {
color: #33b5e5 !important; }
-
+
a.external-link {
background:url('../images/styles/open_new_page.png') no-repeat 100% 50%;
padding-right:16px;
@@ -338,10 +338,10 @@
width: 34px;
height: 34px; }
#nav li.expanded li ul.tree-list-children {
- padding:0;
+ padding:0;
}
#nav li.expanded li ul.tree-list-children .tree-list-children {
- padding:0 0 0 10px;
+ padding:0 0 0 10px;
}
#nav li span.tree-list-subtitle {
display:inline-block;
@@ -408,7 +408,7 @@
.content-header.just-links {
margin-bottom:0;
padding-bottom:0;}
-
+
.content-header h1 {
color:#000;
margin:0;
@@ -470,8 +470,8 @@
height: 10px;
display: inline-block;
margin-left: 5px; }
-
-
+
+
.training-nav-top a {
display:block;
float:left;
@@ -488,25 +488,25 @@
border-left:0;
width:123px;
}
-
+
.paging-links a.disabled,
.training-nav-top a.disabled,
.content-footer a.disabled {
color:#bbb;
}
-
+
.paging-links a.disabled:hover,
.training-nav-top a.disabled:hover,
.content-footer a.disabled:hover {
cursor:default;
color:#bbb !important;
}
-
+
.training-nav-top a.start-class-link,
.training-nav-top a.start-course-link {
width:262px;
}
-
+
/* list of classes on course landing page */
ol.class-list {
list-style:none;
@@ -549,7 +549,7 @@
ol.class-list li a.title:hover span {
display:block;
}
-
+
#jd-content
ol.class-list li img {
float:left;
@@ -577,29 +577,29 @@
margin:0 0 6px;
line-height:16px;
}
-
-
+
+
.hide {
display:none !important;
}
-
+
.content-footer.next-class {
display:block;
border:0;
margin-top:0;
padding-top:0;
}
-
+
.content-footer.next-class a.next-class-link {
display:block;
float:right;
text-transform:uppercase;
}
-
-
-
+
+
+
/* inner-doc tabs w/ title */
-
+
div#title-tabs-wrapper {
border-bottom:1px solid #ccc;
margin:20px 0 30px;
@@ -932,7 +932,7 @@
.ui-table th,
.ui-table td {
padding: 5px 10px;
- background-color: inherit;
+ background-color: inherit;
border:0;}
.ui-table thead th {
font-weight: bold; }
@@ -957,7 +957,7 @@
background-image: url(../images/styles/ico_wrong.png); }
.do-dont-label.good {
background-image: url(../images/styles/ico_good.png); }
-
+
@@ -1008,7 +1008,7 @@
fieldset, iframe, img {
border: 0;
}
-img {
+img {
-ms-interpolation-mode: bicubic;
vertical-align: middle;
max-width: 100%;
@@ -1043,7 +1043,7 @@
margin-right:320px;
}
h1.super {
- font-size: 37px;
+ font-size: 37px;
}
h2 {
color:#333;
@@ -1064,13 +1064,13 @@
font-size: 16px;
}
h5 {
- font-size: 14px;
+ font-size: 14px;
}
h5, h6 {
margin: 5px 0;
}
h6 {
- font-size: 12px;
+ font-size: 12px;
}
hr { /* applied to the bottom of h2 elements */
height: 1px;
@@ -1256,7 +1256,7 @@
padding: 0 24px 0 0;
}
.locales form {
- margin: 0;
+ margin: 0;
}
.locales select, .sites select {
line-height: 3.08;
@@ -1352,7 +1352,7 @@
padding: 2.5em 0;
border-top: solid 1px #ddd;
border-bottom: solid 1px #ddd;
- background: #f7f7f7;
+ background: #f7f7f7;
}
.wrap {
margin: 0 auto;
@@ -1478,7 +1478,7 @@
top: 24px;
left: 0
}
-.search .left, .search .right {
+.search .left, .search .right {
height: 5px;
width: 1px
}
@@ -1549,7 +1549,7 @@
padding: 0
}
.search-dropdown ul li {
- clear: both
+ clear: both
}
.search-dropdown img {
float: left;
@@ -1682,7 +1682,7 @@
endColorstr='#ffffff',GradientType=0 ); /* IE6-8 */
-webkit-box-shadow: inset 0px 0px 5px 2px rgba(0, 0, 0, .05);
-moz-box-shadow: inset 0px 0px 5px 2px rgba(0, 0, 0, .05);
- box-shadow: inset 0px 0px 5px 2px rgba(0, 0, 0, .05);
+ box-shadow: inset 0px 0px 5px 2px rgba(0, 0, 0, .05);
color: #258AAF !important;
}
.button.big {
@@ -1715,7 +1715,7 @@
width:130px;
text-transform:uppercase;
font-weight:bold;
-
+
background-color: #f3f3f3;
background-image: -webkit-gradient(linear, left top, left bottom, from(#f9f9f9), to(#ececec));
background-image: -webkit-linear-gradient(top, #f9f9f9, #ececec);
@@ -1973,9 +1973,9 @@
padding: 5px;
width: 130px;
}
-
+
.article form .browse .browse-msg {
- font-size: 11.5px;
+ font-size: 11.5px;
}
.article form .browse .button-secondary {
height: auto;
@@ -1990,7 +1990,7 @@
color: #222;
line-height: normal;
padding: 6px 10px;
- width: 300px;
+ width: 300px;
}
.article form textarea {
height: 150px;
@@ -2097,7 +2097,7 @@
padding: 1em;
overflow: auto;
border: solid 1px #ddd;
- background: #f7f7f7;
+ background: #f7f7f7;
}
.str { color: #080; }
.kwd { color: #008; }
@@ -2127,16 +2127,16 @@
height:270px;
max-height: inherit;
overflow: hidden;
- position: relative;
+ position: relative;
}
#classes-nav {
overflow: hidden;
- position: relative;
+ position: relative;
}
#packages-nav ul, #classes-nav ul {
list-style-type: none;
margin: 10px 0 20px 0;
- padding: 0;
+ padding: 0;
}
#classes-nav li {
font-weight: bold;
@@ -2154,7 +2154,7 @@
#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: #222;
- font-weight: normal;
+ font-weight: normal;
}
#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 {
@@ -2200,7 +2200,7 @@
#nav-swap .fullscreen.disabled {
background-position: 0 0;
}
-#nav-swap .fullscreen:hover,
+#nav-swap .fullscreen:hover,
#nav-swap .fullscreen:focus {
cursor:pointer;
}
@@ -2277,13 +2277,13 @@
margin-right:0;
}
#doc-content-container {
- margin-left: 291px
+ margin-left: 291px
}
#doc-header, #doc-content {
padding: 1em 2em;
}
#doc-header {
- background: #f7f7f7;
+ background: #f7f7f7;
}
#doc-header h1 {
line-height: 0;
@@ -2358,9 +2358,6 @@
#jd-content img.toggle-content-img {
margin:0 5px 5px 0;
}
-div.toggle-content p {
- margin:10px 0 0;
-}
div.toggle-content-toggleme {
padding:0 0 0 15px;
}
@@ -2411,7 +2408,7 @@
border-bottom: solid 1px #ededed;
background: #f7f7f7 url("../images/resizable-s2.png") no-repeat scroll center center; }
/*
-.ui-resizable-e {
+.ui-resizable-e {
cursor: e-resize; width: 10px; right: 0; top: 0; height: 100%; border-right: solid
1px #ededed;background: #f7f7f7 url("../images/resizable-e2.png") no-repeat scroll center center; }
*/
@@ -2419,7 +2416,7 @@
/* --------------------------------------------------------------------------
Lightbox
*/
-.lightbox {
+.lightbox {
width: 769px;
padding: 1.5em;
margin: 0 auto;
@@ -2432,7 +2429,7 @@
.lightbox .header {
float: left;
width: 720px;
- margin: -10px 20px 10px 0;
+ margin: -10px 20px 10px 0;
}
.lightbox .close {
float: right;
@@ -2492,7 +2489,7 @@
.caption {
margin: 0.5em 0 2em 0;
color: #000;
- font-size: 11.5px;
+ font-size: 11.5px;
}
.nolist {
@@ -2551,19 +2548,19 @@
}
p.code-caption {
- margin: 0 0 4px 0;
+ margin-bottom: 4px;
font: 12px/1.5 monospace;
color:#666;
}
-div.note,
-div.caution,
+div.note,
+div.caution,
div.warning {
margin: 0 0 15px;
}
-p.note, div.note,
-p.caution, div.caution,
+p.note, div.note,
+p.caution, div.caution,
p.warning, div.warning {
padding: 0 0 0 10px;
border-left: 4px solid;
@@ -2719,12 +2716,12 @@
/* -----------------------------------------------
-good/bad example containers
+good/bad example containers
*/
div.example-block {
background-repeat: no-repeat;
- background-position:10px 8px;
+ background-position:10px 8px;
background-color:#ccc;
padding:4px;
margin:.8em auto 1.5em 2em;
@@ -2758,7 +2755,7 @@
}
/* -----------------------------------------------
-Dialog box for popup messages
+Dialog box for popup messages
*/
div.dialog {
@@ -2824,9 +2821,9 @@
/* --------------------------------------------------------------------------
-Slideshow Controls & Next/Prev
+Slideshow Controls & Next/Prev
*/
-.slideshow-next, .slideshow-prev {
+.slideshow-next, .slideshow-prev {
width: 20px;
height: 36px;
text-indent: -1000em;
@@ -2849,7 +2846,7 @@
a.slideshow-prev, a.slideshow-prev:visited {
- float: left;
+ float: left;
background: url(../images/arrow-left.png) no-repeat 0 0
@@ -2857,18 +2854,18 @@
.slideshow-next:hover, .slideshow-prev:hover, .slideshow-next:focus, .slideshow-prev:focus {
- background-position: 0 -36px
+ background-position: 0 -36px
}
.slideshow-next:active, .slideshow-prev:active {
- background-position: 0 -72px
+ background-position: 0 -72px
}
.slideshow-nav {
width: 74px;
- margin: 0 auto;
+ margin: 0 auto;
}
.slideshow-nav a, .slideshow-nav a:visited {
display: inline-block;
@@ -2888,7 +2885,7 @@
.slideshow-nav a:active {
background: #1e799a;
- background: #ebebeb;
+ background: #ebebeb;
-webkit-box-shadow: inset 0px 0px 5px 2px rgba(0, 0, 0, .05);
-moz-box-shadow: inset 0px 0px 5px 2px rgba(0, 0, 0, .05);
box-shadow: inset 0px 0px 5px 2px rgba(0, 0, 0, .05);
@@ -2901,7 +2898,7 @@
*/
ul.tabs {
padding: 0;
- margin: 2em 0 0 0;
+ margin: 2em 0 0 0;
}
ul.tabs:before, ul.tabs:after {
content: "";
@@ -2910,7 +2907,7 @@
}
ul.tabs li {
list-style-type: none;
- float: left;
+ float: left;
}
ul.tabs li a, ul.tabs li a:active, ul.tabs li a:visited {
display: block;
@@ -2924,7 +2921,7 @@
-moz-border-radius-bottomright: px;
-moz-border-radius-bottomleft: px;
-webkit-border-radius: 2px 2px px px;
- border-radius: 2px 2px px px;
+ border-radius: 2px 2px px px;
border-top: solid 1px #ebebeb;
border-left: solid 1px #ebebeb;
border-right: solid 1px #ebebeb;
@@ -2939,7 +2936,7 @@
EndColorStr='#fafafa');
}
ul.tabs li a:hover {
- color: #33B5E5;
+ color: #33B5E5;
}
ul.tabs li a.selected {
height: 37px;
@@ -2978,9 +2975,9 @@
.dialog .box-border .top,
.dialog .box-border .bottom { width:391px; }
-.box-border .left, .box-border .right {
+.box-border .left, .box-border .right {
width: 1px;
- height: 8px;
+ height: 8px;
}
.box-border .top { top: 0; left: 0 }
.box-border .top .left { top: 1px; left: 0 }
@@ -3015,10 +3012,10 @@
transition: color .4s ease;
}
.feature-box:hover {
- cursor: pointer;
+ cursor: pointer;
}
.feature-box:hover .box-border .top, .feature-box:hover .box-border .bottom, .feature-box:hover
-.left, .feature-box:hover .right {
+.left, .feature-box:hover .right {
background-color: #33B5E5;
}
.feature-box:hover h4, .feature-box:hover a {
@@ -3027,7 +3024,7 @@
/* --------------------------------------------------------------------------
Page-Specific Styles
*/
-.colors {
+.colors {
position: relative;
float: left;
width: 92px;
@@ -3446,7 +3443,7 @@
font-size:0.85em;
}
-.suggest-card.reference
+.suggest-card.reference
.search_filtered li.header {
color:#aaa;
font-size: 0.81em;
@@ -3797,7 +3794,7 @@
}
#quicknav {
- float:none;
+ float:none;
clear:both;
margin-left:180px;
margin-top:-30px;
@@ -3865,7 +3862,7 @@
#header-wrap.quicknav {
height:196px;
-
+
}
/* SEARCH AND MORE */
@@ -3912,7 +3909,7 @@
left: 0
}
-.search .left, .search .right {
+.search .left, .search .right {
height: 5px;
width: 1px
}
@@ -3938,10 +3935,10 @@
.search form input {
color: #2f2f2f;
font-size: 0.95em;
- width: 178px;
+ width: 178px;
border: none;
- margin-left: 6px;
- z-index: 1500;
+ margin-left: 6px;
+ z-index: 1500;
position: relative;
background-color: transparent;
border-bottom:1px solid #CCC;
@@ -4010,10 +4007,10 @@
opacity:0;
-webkit-transform-origin:100% 0%;
- -moz-transform-origin:100% 0%;
+ -moz-transform-origin:100% 0%;
-o-transform-origin:100% 0%;
transform-origin:100% 0%;
-
+
-webkit-transition-property: -webkit-opacity;
-webkit-transition-duration: .25s;
-webkit-transition-timing-function:ease;
@@ -4025,7 +4022,7 @@
-o-transition-property: -o-opacity;
-o-transition-duration: .25s;
-o-transition-timing-function:ease;
-
+
transition-property: opacity;
transition-duration: .25s;
transition-timing-function:ease;
@@ -4123,9 +4120,9 @@
border-radius:6px;
background-color:#ccc;
cursor:pointer;
- -webkit-transition:color .5s ease-in;
- -moz-transition:color .5s ease-in;
- -o-transition:color .5s ease-in;
+ -webkit-transition:color .5s ease-in;
+ -moz-transition:color .5s ease-in;
+ -o-transition:color .5s ease-in;
transition:color .5s ease-in;
}
.slideshow-container .pagination ul li:hover {
@@ -4261,7 +4258,7 @@
background-image: -ms-linear-gradient(left, #5dbcd9, #4cadcb);
background-image: -o-linear-gradient(left, #5dbcd9, #4cadcb);
background-image: linear-gradient(left, #5dbcd9, #4cadcb);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#5dbcd9', EndColorStr='#4cadcb');
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#5dbcd9', EndColorStr='#4cadcb');
}
.jspHorizontalBar .jspTrack,
diff --git a/tools/droiddoc/templates-sdk/assets/js/docs.js b/tools/droiddoc/templates-sdk/assets/js/docs.js
index ba65e44..2d72ed5 100644
--- a/tools/droiddoc/templates-sdk/assets/js/docs.js
+++ b/tools/droiddoc/templates-sdk/assets/js/docs.js
@@ -183,6 +183,7 @@
$("#nav-x li.google a").addClass("selected");
} else {
$("#nav-x li.reference a").addClass("selected");
+ changeApiLevel(); // turn things grey
}
} else if ((rootDir == "tools") || (rootDir == "sdk")) {
$("#nav-x li.tools a").addClass("selected");
diff --git a/tools/droiddoc/templates-sdk/sdkpage.cs b/tools/droiddoc/templates-sdk/sdkpage.cs
index 3ebf697..ecc26f5 100644
--- a/tools/droiddoc/templates-sdk/sdkpage.cs
+++ b/tools/droiddoc/templates-sdk/sdkpage.cs
@@ -79,63 +79,112 @@
<tr>
<th>Platform</th>
<th>Package</th>
- <th>Size</th>
+ <th style="white-space:nowrap">Size (Bytes)</th>
<th>MD5 Checksum</th>
</tr>
<tr>
- <td>Windows 32-bit</td>
+ <td rowspan="2" style="white-space:nowrap">Windows 32-bit</td>
<td>
<a onClick="return onDownload(this)"
href="http://dl.google.com/android/ndk/<?cs var:ndk.win32_download ?>"><?cs var:ndk.win32_download ?></a>
</td>
- <td><?cs var:ndk.win32_bytes ?> bytes</td>
+ <td><?cs var:ndk.win32_bytes ?></td>
<td><?cs var:ndk.win32_checksum ?></td>
</tr>
<tr>
- <td>Windows 64-bit</td>
+ <td>
+ <a onClick="return onDownload(this)"
+ href="http://dl.google.com/android/ndk/<?cs var:ndk.win32.legacy_download ?>"><?cs var:ndk.win32.legacy_download ?></a>
+ </td>
+ <td><?cs var:ndk.win32.legacy_bytes ?></td>
+ <td><?cs var:ndk.win32.legacy_checksum ?></td>
+ </tr>
+ <tr>
+ <td rowspan="2" style="white-space:nowrap">Windows 64-bit</td>
<td>
<a onClick="return onDownload(this)"
href="http://dl.google.com/android/ndk/<?cs var:ndk.win64_download ?>"><?cs var:ndk.win64_download ?></a>
</td>
- <td><?cs var:ndk.win64_bytes ?> bytes</td>
+ <td><?cs var:ndk.win64_bytes ?></td>
<td><?cs var:ndk.win64_checksum ?></td>
</tr>
<tr>
- <td>Mac OS X 32-bit</td>
+ <td>
+ <a onClick="return onDownload(this)"
+ href="http://dl.google.com/android/ndk/<?cs var:ndk.win64.legacy_download ?>"><?cs var:ndk.win64.legacy_download ?></a>
+ </td>
+ <td><?cs var:ndk.win64.legacy_bytes ?></td>
+ <td><?cs var:ndk.win64.legacy_checksum ?></td>
+ </tr>
+ <tr>
+ <td rowspan="2" style="white-space:nowrap">Mac OS X 32-bit</td>
<td>
<a onClick="return onDownload(this)"
href="http://dl.google.com/android/ndk/<?cs var:ndk.mac32_download ?>"><?cs var:ndk.mac32_download ?></a>
</td>
- <td><?cs var:ndk.mac32_bytes ?> bytes</td>
+ <td><?cs var:ndk.mac32_bytes ?></td>
<td><?cs var:ndk.mac32_checksum ?></td>
</tr>
<tr>
- <td>Mac OS X 64-bit</td>
+ <td>
+ <a onClick="return onDownload(this)"
+ href="http://dl.google.com/android/ndk/<?cs var:ndk.mac32.legacy_download ?>"><?cs var:ndk.mac32.legacy_download ?></a>
+ </td>
+ <td><?cs var:ndk.mac32.legacy_bytes ?></td>
+ <td><?cs var:ndk.mac32.legacy_checksum ?></td>
+ </tr>
+ <tr>
+ <td rowspan="2" style="white-space:nowrap">Mac OS X 64-bit</td>
<td>
<a onClick="return onDownload(this)"
href="http://dl.google.com/android/ndk/<?cs var:ndk.mac64_download ?>"><?cs var:ndk.mac64_download ?></a>
</td>
- <td><?cs var:ndk.mac64_bytes ?> bytes</td>
+ <td><?cs var:ndk.mac64_bytes ?></td>
<td><?cs var:ndk.mac64_checksum ?></td>
</tr>
<tr>
- <td>Linux 32-bit (x86)</td>
+ <td>
+ <a onClick="return onDownload(this)"
+ href="http://dl.google.com/android/ndk/<?cs var:ndk.mac64.legacy_download ?>"><?cs var:ndk.mac64.legacy_download ?></a>
+ </td>
+ <td><?cs var:ndk.mac64.legacy_bytes ?></td>
+ <td><?cs var:ndk.mac64.legacy_checksum ?></td>
+ </tr>
+
+ <tr>
+ <td rowspan="2" style="white-space:nowrap">Linux 32-bit (x86)</td>
<td>
<a onClick="return onDownload(this)"
href="http://dl.google.com/android/ndk/<?cs var:ndk.linux32_download ?>"><?cs var:ndk.linux32_download ?></a>
</td>
- <td><?cs var:ndk.linux32_bytes ?> bytes</td>
+ <td><?cs var:ndk.linux32_bytes ?></td>
<td><?cs var:ndk.linux32_checksum ?></td>
</tr>
<tr>
- <td>Linux 64-bit (x86)</td>
+ <td>
+ <a onClick="return onDownload(this)"
+ href="http://dl.google.com/android/ndk/<?cs var:ndk.linux32.legacy_download ?>"><?cs var:ndk.linux32.legacy_download ?></a>
+ </td>
+ <td><?cs var:ndk.linux32.legacy_bytes ?></td>
+ <td><?cs var:ndk.linux32.legacy_checksum ?></td>
+ </tr>
+ <tr>
+ <td rowspan="2" style="white-space:nowrap">Linux 64-bit (x86)</td>
<td>
<a onClick="return onDownload(this)"
href="http://dl.google.com/android/ndk/<?cs var:ndk.linux64_download ?>"><?cs var:ndk.linux64_download ?></a>
</td>
- <td><?cs var:ndk.linux64_bytes ?> bytes</td>
+ <td><?cs var:ndk.linux64_bytes ?></td>
<td><?cs var:ndk.linux64_checksum ?></td>
</tr>
+ <tr>
+ <td>
+ <a onClick="return onDownload(this)"
+ href="http://dl.google.com/android/ndk/<?cs var:ndk.linux64.legacy_download ?>"><?cs var:ndk.linux64.legacy_download ?></a>
+ </td>
+ <td><?cs var:ndk.linux64.legacy_bytes ?></td>
+ <td><?cs var:ndk.linux64.legacy_checksum ?></td>
+ </tr>
</table>
<?cs ######## HERE IS THE JD DOC CONTENT ######### ?>