am 7bfd28d7: am 4bfc9991: am 5c0f9e99: Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev

* commit '7bfd28d74468845b5d2ef0db7753ef1e0075a575':
  fix docs.js bug where changeApiLevel is getting called
This commit is contained in:
Robert Ly
2012-12-03 13:03:41 -08:00
committed by Android Git Automerger

View File

@@ -1853,15 +1853,16 @@ function escapeHTML(string) {
/* ######################################################## */ /* ######################################################## */
/* Initialize some droiddoc stuff, but only if we're in the reference */ /* Initialize some droiddoc stuff, but only if we're in the reference */
if ((location.pathname.indexOf("/reference") && if (location.pathname.indexOf("/reference")) {
!location.pathname.indexOf("/reference-gms/packages.html") && if(!location.pathname.indexOf("/reference-gms/packages.html")
!location.pathname.indexOf("/reference-gcm/packages.html") && && !location.pathname.indexOf("/reference-gcm/packages.html")
!location.pathname.indexOf("/reference/com/google")) == 0) { && !location.pathname.indexOf("/reference/com/google") == 0) {
$(document).ready(function() { $(document).ready(function() {
// init available apis based on user pref // init available apis based on user pref
changeApiLevel(); changeApiLevel();
initSidenavHeightResize() initSidenavHeightResize()
}); });
}
} }
var API_LEVEL_COOKIE = "api_level"; var API_LEVEL_COOKIE = "api_level";