tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 7ebafd5a: Merge change 9009 into donut

Browse source 
Merge commit '7ebafd5aa03e9d84696be0448f9d248e8f90e16c'

* commit '7ebafd5aa03e9d84696be0448f9d248e8f90e16c':
  Reapply modifications from 3175 to fix display of navTree in doc output.
This commit is contained in:
Android (Google) Code Review 2009-07-30 06:56:59 -07:00 committed by Android Git Automerger
commit 1951d0eed9
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tools/droiddoc/templates-sdk/customization.cs
View file

@ -159,8 +159,9 @@ def:default_left_nav() ?>
if (!isMobile) {
$("<a href='#' id='nav-swap' onclick='swapNav();return false;' style='font-size:10px;line-height:9px;margin-left:1em;text-decoration:none;'><span id='tree-link'>Use Tree Navigation</span><span id='panel-link' style='display:none'>Use Panel Navigation</span></a>").appendTo("#side-nav");
chooseDefaultNav();
if ($("#nav-tree").is(':visible')) init_navtree("nav-tree", "<?cs var:toroot ?>", NAVTREE_DATA);
else {
if ($("#nav-tree").is(':visible')) {
init_default_navtree("<?cs var:toroot ?>");
} else {
addLoadEvent(function() {
scrollIntoView("packages-nav");
scrollIntoView("classes-nav");

11
tools/droiddoc/templates/assets/android-developer-docs.js
View file

@ -31,6 +31,15 @@ if ((agent.indexOf("Mobile") != -1) ||
addLoadEvent(mobileSetup);
}
/* loads the lists.js file to the page.
Loading this in the head was slowing page load time */
addLoadEvent( function() {
var lists = document.createElement("script");
lists.setAttribute("type","text/javascript");
lists.setAttribute("src", toRoot+"reference/lists.js");
$("head").append($(lists));
} );
window.onresize = resizeAll;
function mobileSetup() {
@ -306,7 +315,7 @@ function swapNav() {
nav_pref = NAV_PREF_PANELS;
} else {
nav_pref = NAV_PREF_TREE;
init_navtree("nav-tree", toRoot, NAVTREE_DATA);
init_default_navtree(toRoot);
}
var date = new Date();
date.setTime(date.getTime()+(10*365*24*60*60*1000)); // keep this for 10 years