Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev

diff --combined tools/droiddoc/templates-sdk/assets/js/docs.js
index e15ab84,1cf68b3..b5f8946
--- 1/tools/droiddoc/templates-sdk/assets/js/docs.js
--- 2/tools/droiddoc/templates-sdk/assets/js/docs.js
+++ b/tools/droiddoc/templates-sdk/assets/js/docs.js
@@@ -1721,10 -1721,6 +1721,10 @@@ function loadSearchResults() 
    referenceSearcher.setUserDefinedLabel("Reference");
    referenceSearcher.setSiteRestriction("http://developer.android.com/reference/");
  
 +  googleSearcher = new google.search.WebSearch();
 +  googleSearcher.setUserDefinedLabel("Google Services");
 +  googleSearcher.setSiteRestriction("http://developer.android.com/google/");
 +
    blogSearcher = new google.search.WebSearch();
    blogSearcher.setUserDefinedLabel("Blog");
    blogSearcher.setSiteRestriction("http://android-developers.blogspot.com");
@@@ -1735,7 -1731,6 +1735,7 @@@
    searchControl.addSearcher(trainingSearcher, searchOptions);
    searchControl.addSearcher(guidesSearcher, searchOptions);
    searchControl.addSearcher(referenceSearcher, searchOptions);
 +  searchControl.addSearcher(googleSearcher, searchOptions);
    searchControl.addSearcher(blogSearcher, searchOptions);
  
    // configure result options
@@@ -1853,15 -1848,16 +1853,16 @@@ function escapeHTML(string) 
  /* ######################################################## */
  
  /* Initialize some droiddoc stuff, but only if we're in the reference */
- if ((location.pathname.indexOf("/reference") &&
-   !location.pathname.indexOf("/reference-gms/packages.html") &&
-   !location.pathname.indexOf("/reference-gcm/packages.html") &&
-   !location.pathname.indexOf("/reference/com/google")) == 0) {
-   $(document).ready(function() {
-     // init available apis based on user pref
-     changeApiLevel();
-     initSidenavHeightResize()
-   });
+ if (location.pathname.indexOf("/reference")) {
+   if(!location.pathname.indexOf("/reference-gms/packages.html")
+     && !location.pathname.indexOf("/reference-gcm/packages.html")
+     && !location.pathname.indexOf("/reference/com/google") == 0) {
+     $(document).ready(function() {
+       // init available apis based on user pref
+       changeApiLevel();
+       initSidenavHeightResize()
+       });
+   }
  }
  
  var API_LEVEL_COOKIE = "api_level";