am d5ec4db7: Merge "Add sepolicy_version to PRODUCT_PACKAGES"
* commit 'd5ec4db790c59980ed6e38ebed32e89bca8ee13f':
Add sepolicy_version to PRODUCT_PACKAGES
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..282d9c3 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -547,10 +547,20 @@
$(eval r := $(ALL_MODULES.$(m).REQUIRED)) \
$(if $(r), \
$(eval r := $(call module-installed-files,$(r))) \
- $(eval $(call add-required-deps,$(ALL_MODULES.$(m).INSTALLED),$(r))) \
+ $(eval t_m := $(filter $(TARGET_OUT_ROOT)/%, $(ALL_MODULES.$(m).INSTALLED))) \
+ $(eval h_m := $(filter $(HOST_OUT_ROOT)/%, $(ALL_MODULES.$(m).INSTALLED))) \
+ $(eval t_r := $(filter $(TARGET_OUT_ROOT)/%, $(r))) \
+ $(eval h_r := $(filter $(HOST_OUT_ROOT)/%, $(r))) \
+ $(if $(t_m), $(eval $(call add-required-deps, $(t_m),$(t_r)))) \
+ $(if $(h_m), $(eval $(call add-required-deps, $(h_m),$(h_r)))) \
) \
)
+t_m :=
+h_m :=
+t_r :=
+h_r :=
+
# Resolve the dependencies on shared libraries.
$(foreach m,$(TARGET_DEPENDENCIES_ON_SHARED_LIBRARIES), \
$(eval p := $(subst :,$(space),$(m))) \
@@ -828,6 +838,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/target/product/core.mk b/target/product/core.mk
index 5285ba8..d503ddc 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -36,7 +36,6 @@
TelephonyProvider \
UserDictionaryProvider \
VpnDialogs \
- abcc \
atrace \
libandroidfw \
libaudiopreprocessing \
diff --git a/target/product/mini.mk b/target/product/mini.mk
index e0566ee..c1074f7 100644
--- a/target/product/mini.mk
+++ b/target/product/mini.mk
@@ -64,7 +64,6 @@
Shell \
TelephonyProvider \
UserDictionaryProvider \
- abcc \
apache-xml \
audio \
bouncycastle \
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index 91b0f59..3bfb687 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;
@@ -2667,6 +2664,10 @@
margin:0 0 20px 20px;
border:1px solid #ddd;
}
+a.notice-developers.wide,
+a.notice-designers.wide {
+ width:278px;
+}
a.notice-developers div,
a.notice-designers div {
min-height:40px;
@@ -2719,12 +2720,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 +2759,7 @@
}
/* -----------------------------------------------
-Dialog box for popup messages
+Dialog box for popup messages
*/
div.dialog {
@@ -2824,9 +2825,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 +2850,7 @@
a.slideshow-prev, a.slideshow-prev:visited {
- float: left;
+ float: left;
background: url(../images/arrow-left.png) no-repeat 0 0
@@ -2857,18 +2858,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 +2889,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 +2902,7 @@
*/
ul.tabs {
padding: 0;
- margin: 2em 0 0 0;
+ margin: 2em 0 0 0;
}
ul.tabs:before, ul.tabs:after {
content: "";
@@ -2910,7 +2911,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 +2925,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 +2940,7 @@
EndColorStr='#fafafa');
}
ul.tabs li a:hover {
- color: #33B5E5;
+ color: #33B5E5;
}
ul.tabs li a.selected {
height: 37px;
@@ -2978,9 +2979,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 +3016,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 +3028,7 @@
/* --------------------------------------------------------------------------
Page-Specific Styles
*/
-.colors {
+.colors {
position: relative;
float: left;
width: 92px;
@@ -3446,7 +3447,7 @@
font-size:0.85em;
}
-.suggest-card.reference
+.suggest-card.reference
.search_filtered li.header {
color:#aaa;
font-size: 0.81em;
@@ -3797,7 +3798,7 @@
}
#quicknav {
- float:none;
+ float:none;
clear:both;
margin-left:180px;
margin-top:-30px;
@@ -3865,7 +3866,7 @@
#header-wrap.quicknav {
height:196px;
-
+
}
/* SEARCH AND MORE */
@@ -3912,7 +3913,7 @@
left: 0
}
-.search .left, .search .right {
+.search .left, .search .right {
height: 5px;
width: 1px
}
@@ -3938,10 +3939,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 +4011,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 +4026,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 +4124,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 +4262,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..fa7554b 100644
--- a/tools/droiddoc/templates-sdk/assets/js/docs.js
+++ b/tools/droiddoc/templates-sdk/assets/js/docs.js
@@ -11,7 +11,7 @@
var basePath = getBaseUri(location.pathname);
var SITE_ROOT = toRoot + basePath.substring(1,basePath.indexOf("/",1));
var GOOGLE_DATA; // combined data for google service apis, used for search suggest
-
+
// Ensure that all ajax getScript() requests allow caching
$.ajaxSetup({
cache: true
@@ -59,10 +59,10 @@
toggleFullscreen(false);
}
});
-
+
// initialize the divs with custom scrollbars
$('.scroll-pane').jScrollPane( {verticalGutter:0} );
-
+
// add HRs below all H2s (except for a few other h2 variants)
$('h2').not('#qv h2').not('#tb h2').not('.sidebox h2').not('#devdoc-nav h2').not('h2.norule').css({marginBottom:0}).after('<hr/>');
@@ -78,7 +78,7 @@
});
// Set up quicknav
- var quicknav_open = false;
+ var quicknav_open = false;
$("#btn-quicknav").click(function() {
if (quicknav_open) {
$(this).removeClass('active');
@@ -90,20 +90,20 @@
expand();
}
})
-
+
var expand = function() {
$('#header-wrap').addClass('quicknav');
$('#quicknav').stop().show().animate({opacity:'1'});
}
-
+
var collapse = function() {
$('#quicknav').stop().animate({opacity:'0'}, 100, function() {
$(this).hide();
$('#header-wrap').removeClass('quicknav');
});
}
-
-
+
+
//Set up search
$("#search_autocomplete").focus(function() {
$("#search-container").addClass('active');
@@ -127,7 +127,7 @@
}
})
-
+
// prep nav expandos
var pagePath = document.location.pathname;
// account for intl docs by removing the intl/*/ path
@@ -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");
@@ -209,7 +210,7 @@
// set up prev links
var $prevLink = [];
var $prevListItem = $selListItem.prev('li');
-
+
var crossBoundaries = ($("body.design").length > 0) || ($("body.guide").length > 0) ? true :
false; // navigate across topic boundaries only in design docs
if ($prevListItem.length) {
@@ -224,10 +225,10 @@
// jump to this section's index page (if it exists)
var $parentListItem = $selListItem.parents('li');
$prevLink = $selListItem.parents('li').find('a');
-
+
// except if cross boundaries aren't allowed, and we're at the top of a section already
// (and there's another parent)
- if (!crossBoundaries && $parentListItem.hasClass('nav-section')
+ if (!crossBoundaries && $parentListItem.hasClass('nav-section')
&& $selListItem.hasClass('nav-section')) {
$prevLink = [];
}
@@ -238,7 +239,7 @@
var startClass = false;
var training = $(".next-class-link").length; // decides whether to provide "next class" link
var isCrossingBoundary = false;
-
+
if ($selListItem.hasClass('nav-section')) {
// we're on an index page, jump to the first topic
$nextLink = $selListItem.find('ul:eq(0)').find('a:eq(0)');
@@ -251,7 +252,7 @@
// then set the landing page "start link" text to be the first doc title
$('.topic-start-link').text($nextLink.text().toUpperCase());
}
-
+
// If the selected page has a description, then it's a class or article homepage
if ($selListItem.find('a[description]').length) {
// this means we're on a class landing page
@@ -273,7 +274,7 @@
if (startClass) {
$('.start-class-link').attr('href', $nextLink.attr('href')).removeClass("hide");
- // if there's no training bar (below the start button),
+ // if there's no training bar (below the start button),
// then we need to add a bottom border to button
if (!$("#tb").length) {
$('.start-class-link').css({'border-bottom':'1px solid #DADADA'});
@@ -283,7 +284,7 @@
$('.next-page-link').attr('href','')
.removeClass("hide").addClass("disabled")
.click(function() { return false; });
-
+
$('.next-class-link').attr('href',$nextLink.attr('href'))
.removeClass("hide").append($nextLink.html());
$('.next-class-link').find('.new').empty();
@@ -298,7 +299,7 @@
} else {
$('.prev-page-link').attr('href', $prevLink.attr('href')).removeClass("hide");
}
- }
+ }
// If this is a training 'article', there should be no prev/next nav
// ... if the grandparent is the "nav" ... and it has no child list items...
@@ -307,16 +308,16 @@
$('.next-page-link,.prev-page-link').attr('href','').addClass("disabled")
.click(function() { return false; });
}
-
+
}
-
-
-
+
+
+
// Set up the course landing pages for Training with class names and descriptions
if ($('body.trainingcourse').length) {
var $classLinks = $selListItem.find('ul li a').not('#nav .nav-section .nav-section ul a');
var $classDescriptions = $classLinks.attr('description');
-
+
var $olClasses = $('<ol class="class-list"></ol>');
var $liClass;
var $imgIcon;
@@ -328,18 +329,20 @@
$liClass = $('<li></li>');
$h2Title = $('<a class="title" href="'+$(this).attr('href')+'"><h2>' + $(this).html()+'</h2><span></span></a>');
$pSummary = $('<p class="description">' + $(this).attr('description') + '</p>');
-
+
$olLessons = $('<ol class="lesson-list"></ol>');
-
+
$lessons = $(this).closest('li').find('ul li a');
-
+
if ($lessons.length) {
- $imgIcon = $('<img src="'+toRoot+'assets/images/resource-tutorial.png" alt=""/>');
+ $imgIcon = $('<img src="'+toRoot+'assets/images/resource-tutorial.png" '
+ + ' width="64" height="64" alt=""/>');
$lessons.each(function(index) {
$olLessons.append('<li><a href="'+$(this).attr('href')+'">' + $(this).html()+'</a></li>');
});
} else {
- $imgIcon = $('<img src="'+toRoot+'assets/images/resource-article.png" alt=""/>');
+ $imgIcon = $('<img src="'+toRoot+'assets/images/resource-article.png" '
+ + ' width="64" height="64" alt=""/>');
$pSummary.addClass('article');
}
@@ -370,7 +373,7 @@
// first hide all other siblings
var $others = $('li.nav-section.expanded', $(this).closest('ul'));
$others.removeClass('expanded').children('ul').slideUp(250);
-
+
// now expand me
section.closest('li').addClass('expanded');
section.children('ul').slideDown(250, function() {
@@ -378,7 +381,7 @@
});
}
});
-
+
$(".scroll-pane").scroll(function(event) {
event.preventDefault();
return false;
@@ -410,10 +413,10 @@
// from a scrollable div and so there's no need to make adjustments to our layout
return;
}
- var scrollTop = $(window).scrollTop();
+ var scrollTop = $(window).scrollTop();
var headerHeight = $('#header').outerHeight();
var subheaderHeight = $('#nav-x').outerHeight();
- var searchResultHeight = $('#searchResults').is(":visible") ?
+ var searchResultHeight = $('#searchResults').is(":visible") ?
$('#searchResults').outerHeight() : 0;
var totalHeaderHeight = headerHeight + subheaderHeight + searchResultHeight;
// we set the navbar fixed when the scroll position is beyond the height of the site header...
@@ -423,20 +426,20 @@
if ($("#doc-col").height() < $("#side-nav").height()) {
navBarShouldBeFixed = false;
}
-
+
var scrollLeft = $(window).scrollLeft();
// When the sidenav is fixed and user scrolls horizontally, reposition the sidenav to match
if (navBarIsFixed && (scrollLeft != prevScrollLeft)) {
updateSideNavPosition();
prevScrollLeft = scrollLeft;
}
-
- // Don't continue if the header is sufficently far away
+
+ // Don't continue if the header is sufficently far away
// (to avoid intensive resizing that slows scrolling)
if (navBarIsFixed && navBarShouldBeFixed) {
return;
}
-
+
if (navBarIsFixed != navBarShouldBeFixed) {
if (navBarShouldBeFixed) {
// make it fixed
@@ -447,7 +450,7 @@
.prependTo('#body-content');
// add neato "back to top" button
$('#devdoc-nav a.totop').css({'display':'block','width':$("#nav").innerWidth()+'px'});
-
+
// update the sidenaav position for side scrolling
updateSideNavPosition();
} else {
@@ -459,12 +462,12 @@
$('#devdoc-nav a.totop').hide();
}
navBarIsFixed = navBarShouldBeFixed;
- }
-
+ }
+
resizeNav(250); // pass true in order to delay the scrollbar re-initialization for performance
});
-
+
var navBarLeftPos;
if ($('#devdoc-nav').length) {
setNavBarLeftPos();
@@ -527,16 +530,16 @@
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
- // Revise the sidenav widths to make room for the scrollbar
+ // Revise the sidenav widths to make room for the scrollbar
// which avoids the visible width from changing each time the bar appears
var $sidenav = $("#side-nav");
var sidenav_width = parseInt($sidenav.innerWidth());
-
+
$("#devdoc-nav #nav").css("width", sidenav_width - 4 + "px"); // 4px is scrollbar width
$(".scroll-pane").removeAttr("tabindex"); // get rid of tabindex added by jscroller
-
+
if ($(".scroll-pane").length > 1) {
// Check if there's a user preference for the panel heights
var cookieHeight = readCookie("reference_height");
@@ -544,7 +547,7 @@
restoreHeight(cookieHeight);
}
}
-
+
resizeNav();
/* init the language selector based on user cookie for lang */
@@ -591,7 +594,7 @@
// Find this page's <li> in sidenav and set selected
$selListItem = $selNavLink.closest('li');
$selListItem.addClass('selected');
-
+
// Traverse up the tree and expand all parent nav-sections
$selNavLink.parents('li.nav-section').each(function() {
$(this).addClass('expanded');
@@ -637,7 +640,7 @@
$('#devdoc-nav').css({left: -newLeft});
$('#devdoc-nav .totop').css({left: -(newLeft - parseInt($('#side-nav').css('margin-left')))});
}
-
+
@@ -682,7 +685,7 @@
var $nav = $("#devdoc-nav");
var $window = $(window);
var navHeight;
-
+
// Get the height of entire window and the total header height.
// Then figure out based on scroll position whether the header is visible
var windowHeight = $window.height();
@@ -690,12 +693,12 @@
var headerHeight = $('#header').outerHeight();
var subheaderHeight = $('#nav-x').outerHeight();
var headerVisible = (scrollTop < (headerHeight + subheaderHeight));
-
- // get the height of space between nav and top of window.
+
+ // get the height of space between nav and top of window.
// Could be either margin or top position, depending on whether the nav is fixed.
- var topMargin = (parseInt($nav.css('margin-top')) || parseInt($nav.css('top'))) + 1;
+ var topMargin = (parseInt($nav.css('margin-top')) || parseInt($nav.css('top'))) + 1;
// add 1 for the #side-nav bottom margin
-
+
// Depending on whether the header is visible, set the side nav's height.
if (headerVisible) {
// The sidenav height grows as the header goes off screen
@@ -704,44 +707,44 @@
// Once header is off screen, the nav height is almost full window height
navHeight = windowHeight - topMargin;
}
-
-
-
+
+
+
$scrollPanes = $(".scroll-pane");
if ($scrollPanes.length > 1) {
// subtract the height of the api level widget and nav swapper from the available nav height
navHeight -= ($('#api-nav-header').outerHeight(true) + $('#nav-swap').outerHeight(true));
-
+
$("#swapper").css({height:navHeight + "px"});
if ($("#nav-tree").is(":visible")) {
$("#nav-tree").css({height:navHeight});
}
-
- var classesHeight = navHeight - parseInt($("#resize-packages-nav").css("height")) - 10 + "px";
+
+ var classesHeight = navHeight - parseInt($("#resize-packages-nav").css("height")) - 10 + "px";
//subtract 10px to account for drag bar
-
- // if the window becomes small enough to make the class panel height 0,
+
+ // if the window becomes small enough to make the class panel height 0,
// then the package panel should begin to shrink
if (parseInt(classesHeight) <= 0) {
$("#resize-packages-nav").css({height:navHeight - 10}); //subtract 10px for drag bar
$("#packages-nav").css({height:navHeight - 10});
}
-
+
$("#classes-nav").css({'height':classesHeight, 'margin-top':'10px'});
$("#classes-nav .jspContainer").css({height:classesHeight});
-
-
+
+
} else {
$nav.height(navHeight);
}
-
+
if (delay) {
updateFromResize = true;
delayedReInitScrollbars(delay);
} else {
reInitScrollbars();
}
-
+
}
var updateScrollbars = false;
@@ -760,7 +763,7 @@
updateFromResize = false;
return;
}
-
+
// We're scheduled for an update and the update request came from this method's setTimeout
if (updateScrollbars && !updateFromResize) {
reInitScrollbars();
@@ -778,7 +781,7 @@
var api = $(this).data('jsp');
if (!api) { setTimeout(reInitScrollbars,300); return;}
api.reinitialise( {verticalGutter:0} );
- });
+ });
$(".scroll-pane").removeAttr("tabindex"); // get rid of tabindex added by jscroller
}
@@ -809,7 +812,7 @@
-/** Scroll the jScrollPane to make the currently selected item visible
+/** Scroll the jScrollPane to make the currently selected item visible
This is called when the page finished loading. */
function scrollIntoView(nav) {
var $nav = $("#"+nav);
@@ -818,13 +821,18 @@
if ($nav.is(':visible')) {
var $selected = $(".selected", $nav);
- if ($selected.length == 0) return;
-
- var selectedOffset = $selected.position().top;
- if (selectedOffset + 90 > $nav.height()) { // add 90 so that we scroll up even
- // if the current item is close to the bottom
- api.scrollTo(0, selectedOffset - ($nav.height() / 4), false); // scroll the item into view
- // to be 1/4 of the way from the top
+ if ($selected.length == 0) {
+ // If no selected item found, exit
+ return;
+ }
+
+ var selectedOffset = $selected.offset().top; // measure offset from top, relative to entire page
+ if (selectedOffset > $nav.height() * .8) { // multiply nav height by .8 so we move up any
+ // items more than 80% down the nav
+ // scroll the item up by an amount 125px less than the window height (account for site header)
+ // and then multiply nav height by .8 to match the 80% threshold used above
+ api.scrollTo(0, selectedOffset - 125 - ($nav.height() * .8), false);
+
}
}
}
@@ -873,7 +881,7 @@
date.setTime(date.getTime()+(10*365*24*60*60*1000)); // default expiration is one week
expiration = date.toGMTString();
}
- var cookieValue = cookie_namespace + section + cookie + "=" + val
+ var cookieValue = cookie_namespace + section + cookie + "=" + val
+ "; expires=" + expiration+"; path=/";
document.cookie = cookieValue;
}
@@ -1012,7 +1020,7 @@
$("#panel-link").toggle();
$("#nav-tree").toggle();
$("#tree-link").toggle();
-
+
resizeNav();
// Gross nasty hack to make tree view show up upon first swap by setting height manually
@@ -1020,7 +1028,7 @@
.css({'height':$("#nav-tree .jspContainer .jspPane").height() +'px'});
// Another nasty hack to make the scrollbar appear now that we have height
resizeNav();
-
+
if ($("#nav-tree").is(':visible')) {
scrollIntoView("nav-tree");
} else {
@@ -1075,7 +1083,7 @@
function changeLangPref(lang, submit) {
var date = new Date();
- expires = date.toGMTString(date.setTime(date.getTime()+(10*365*24*60*60*1000)));
+ expires = date.toGMTString(date.setTime(date.getTime()+(10*365*24*60*60*1000)));
// keep this for 50 years
//alert("expires: " + expires)
writeCookie("pref_lang", lang, null, expires);
@@ -1126,13 +1134,13 @@
toggleMe.slideDown();
$(".toggle-content-text", obj).toggle();
div.removeClass("closed").addClass("open");
- $(".toggle-content-img", div).attr("title", "hide").attr("src", toRoot
+ $(".toggle-content-img", div).attr("title", "hide").attr("src", toRoot
+ "assets/images/triangle-opened.png");
} else { // if it's open, close it
toggleMe.slideUp('fast', function() { // Wait until the animation is done before closing arrow
$(".toggle-content-text", obj).toggle();
div.removeClass("open").addClass("closed");
- $(".toggle-content-img", div).attr("title", "show").attr("src", toRoot
+ $(".toggle-content-img", div).attr("title", "show").attr("src", toRoot
+ "assets/images/triangle-closed.png");
});
}
@@ -1160,7 +1168,7 @@
-/*
+/*
* Slideshow 1.0
* Used on /index.html and /develop/index.html for carousel
*
@@ -1201,7 +1209,7 @@
(function($) {
$.fn.dacSlideshow = function(o) {
-
+
//Options - see above
o = $.extend({
btnPrev: null,
@@ -1216,8 +1224,8 @@
pagination: true
}, o || {});
-
- //Set up a carousel for each
+
+ //Set up a carousel for each
return this.each(function() {
var running = false;
@@ -1226,7 +1234,7 @@
var div = $(this);
var ul = $("ul", div);
var tLi = $("li", ul);
- var tl = tLi.size();
+ var tl = tLi.size();
var timer = null;
var li = $("li", ul);
@@ -1245,7 +1253,7 @@
ul.css(sizeCss, ulSize+"px").css(animCss, -(curr*liSize));
div.css(sizeCss, divSize+"px");
-
+
//Pagination
if (o.pagination) {
var pagination = $("<div class='pagination'></div>");
@@ -1263,7 +1271,7 @@
div.append(pagination);
}
}
-
+
//Previous button
if(o.btnPrev)
$(o.btnPrev).click(function(e) {
@@ -1288,18 +1296,18 @@
pauseRotateTimer();
}
});
-
+
//Auto rotation
if(o.auto) startRotateTimer();
-
+
function startRotateTimer() {
clearInterval(timer);
timer = setInterval(function() {
if (curr == tl-1) {
go(0);
} else {
- go(curr+o.scroll);
- }
+ go(curr+o.scroll);
+ }
}, o.autoTime);
$(o.btnPause).removeClass('paused');
}
@@ -1337,11 +1345,11 @@
[]
).addClass("disabled");
-
+
var nav_items = $('li', pagination);
nav_items.removeClass('active');
nav_items.eq(to).addClass('active');
-
+
}
if(o.auto) startRotateTimer();
@@ -1363,7 +1371,7 @@
})(jQuery);
-/*
+/*
* dacSlideshow 1.0
* Used on develop/index.html for side-sliding tabs
*
@@ -1402,7 +1410,7 @@
*/
(function($) {
$.fn.dacTabbedList = function(o) {
-
+
//Options - see above
o = $.extend({
speed : 250,
@@ -1410,8 +1418,8 @@
nav_id: null,
frame_id: null
}, o || {});
-
- //Set up a carousel for each
+
+ //Set up a carousel for each
return this.each(function() {
var curr = 0;
@@ -1419,17 +1427,17 @@
var animCss = "margin-left";
var sizeCss = "width";
var div = $(this);
-
+
var nav = $(o.nav_id, div);
var nav_li = $("li", nav);
- var nav_size = nav_li.size();
+ var nav_size = nav_li.size();
var frame = div.find(o.frame_id);
var content_width = $(frame).find('ul').width();
//Buttons
$(nav_li).click(function(e) {
go($(nav_li).index($(this)));
})
-
+
//Go to an item
function go(to) {
if(!running) {
@@ -1442,10 +1450,10 @@
}
);
-
+
nav_li.removeClass('active');
nav_li.eq(to).addClass('active');
-
+
}
return false;
@@ -1652,7 +1660,7 @@
* otherwise invokes search suggestions on key-up event.
* @param e The JS event
* @param kd True if the event is key-down
- * @param toroot A string for the site's root path
+ * @param toroot A string for the site's root path
* @returns True if the event should bubble up
*/
function search_changed(e, kd, toroot)
@@ -1746,7 +1754,7 @@
if ($($("li", $selectedUl)[gSelectedIndex]).hasClass("header")) {
gSelectedIndex++;
}
- // set item selected
+ // set item selected
$('li:nth-child('+(gSelectedIndex+1)+')', $selectedUl).addClass('jd-selected');
return false;
}
@@ -1764,7 +1772,7 @@
if ($($("li", $selectedUl)[gSelectedIndex]).hasClass("header")) {
gSelectedIndex++;
}
- // set item selected
+ // set item selected
$('li:nth-child('+(gSelectedIndex+1)+')', $selectedUl).addClass('jd-selected');
return false;
}
@@ -1995,7 +2003,7 @@
function search_focus_changed(obj, focused)
{
- if (!focused) {
+ if (!focused) {
if(obj.value == ""){
$(".search .close").addClass("hide");
}
@@ -2016,9 +2024,9 @@
$("#searchResults").slideUp();
$(".search .close").addClass("hide");
location.hash = '';
-
+
$("#search_autocomplete").val("").blur();
-
+
// reset the ajax search callback to nothing, so results don't appear unless ENTER
searchControl.setSearchStartingCallback(this, function(control, searcher, query) {});
@@ -2176,10 +2184,10 @@
setTimeout(function() {
// remove any residual page numbers
$('#searchResults .gsc-tabsArea .gsc-cursor-box.gs-bidi-start-align').remove();
- // move the page numbers to the left position; make a clone,
+ // move the page numbers to the left position; make a clone,
// because the element is drawn to the DOM only once
- // and because we're going to remove it (previous line),
- // we need it to be available to move again as the user navigates
+ // and because we're going to remove it (previous line),
+ // we need it to be available to move again as the user navigates
$('#searchResults .gsc-webResult .gsc-cursor-box.gs-bidi-start-align:visible')
.clone().appendTo('#searchResults .gsc-tabsArea');
}, 200);
@@ -2241,22 +2249,22 @@
var maxLevel = 1;
/******* SIDENAV DIMENSIONS ************/
-
+
function initSidenavHeightResize() {
// Change the drag bar size to nicely fit the scrollbar positions
var $dragBar = $(".ui-resizable-s");
$dragBar.css({'width': $dragBar.parent().width() - 5 + "px"});
-
- $( "#resize-packages-nav" ).resizable({
+
+ $( "#resize-packages-nav" ).resizable({
containment: "#nav-panels",
handles: "s",
alsoResize: "#packages-nav",
resize: function(event, ui) { resizeNav(); }, /* resize the nav while dragging */
stop: function(event, ui) { saveNavPanels(); } /* once stopped, save the sizes to cookie */
});
-
+
}
-
+
function updateSidenavFixedWidth() {
if (!navBarIsFixed) return;
$('#devdoc-nav').css({
@@ -2264,7 +2272,7 @@
'margin' : $('#side-nav').css('margin')
});
$('#devdoc-nav a.totop').css({'display':'block','width':$("#nav").innerWidth()+'px'});
-
+
initSidenavHeightResize();
}
@@ -2275,7 +2283,7 @@
'margin' : $('#side-nav').css('margin')
});
$('#devdoc-nav .totop').css({'left': 'inherit'});
-
+
initSidenavHeightResize();
}
@@ -2359,7 +2367,7 @@
if (apiLevelNum > selectedLevelNum) {
obj.addClass("absent").attr("title","Requires API Level \""
+ apiLevel + "\" or higher");
- }
+ }
else obj.removeClass("absent").removeAttr("title");
});
}
@@ -2428,7 +2436,7 @@
node.expanded = false;
}
}
-
+
node.children_ul = null;
node.get_children_ul = function() {
@@ -2456,7 +2464,7 @@
get_node(me, node);
if ($(node.label_div).hasClass("absent")) {
$(node.get_children_ul()).addClass("absent");
- }
+ }
$(node.get_children_ul()).slideDown("fast");
}
node.plus_img.src = me.toroot + "assets/images/triangle-opened-small.png";
@@ -2532,7 +2540,7 @@
init_navtree("tree-list", toroot, NAVTREE_DATA);
}
});
-
+
// perform api level toggling because because the whole tree is new to the DOM
var selectedLevel = $("#apiLevelSelector option:selected").val();
toggleVisisbleApis(selectedLevel, "#side-nav");
@@ -2599,8 +2607,8 @@
node.depth = mom.depth + 1;
node.get_children_ul = function() {
if (!node.children_ul) {
- node.children_ul = document.createElement("ul");
- node.children_ul.className = "tree-list-children";
+ node.children_ul = document.createElement("ul");
+ node.children_ul.className = "tree-list-children";
node.li.appendChild(node.children_ul);
}
return node.children_ul;
@@ -2608,8 +2616,8 @@
node.li = document.createElement("li");
mom.get_children_ul().appendChild(node.li);
-
-
+
+
if(link) {
child = document.createElement("a");
@@ -2622,7 +2630,7 @@
if (children_data != null) {
node.li.className="nav-section";
node.label_div = document.createElement("div");
- node.label_div.className = "nav-section-header-ref";
+ node.label_div.className = "nav-section-header-ref";
node.li.appendChild(node.label_div);
get_google_node(me, node);
node.label_div.appendChild(child);
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 ######### ?>