Merge "docs: further specify design docs' list styles to fix uls appearing like ols" into jb-dev
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index 341dd67..7915fb8 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -4007,4 +4007,4 @@
.plusone {
float:right;
-}
\ No newline at end of file
+}
diff --git a/tools/droiddoc/templates-sdk/assets/js/search_autocomplete.js b/tools/droiddoc/templates-sdk/assets/js/search_autocomplete.js
index bfd0eaed..04f0e93 100644
--- a/tools/droiddoc/templates-sdk/assets/js/search_autocomplete.js
+++ b/tools/droiddoc/templates-sdk/assets/js/search_autocomplete.js
@@ -282,7 +282,6 @@
$("#searchResults").slideUp();
$(".search .close").addClass("hide");
location.hash = '';
- drawOptions.setInput(document.getElementById("searchResults"));
$("#search_autocomplete").val("").blur();
@@ -309,7 +308,6 @@
var searchControl;
function loadSearchResults() {
-
document.getElementById("search_autocomplete").style.color = "#000";
// create search control
@@ -397,11 +395,17 @@
// when an event on the browser history occurs (back, forward, load) requery hash and do search
$(window).hashchange( function(){
- var query = decodeURI(getQuery(location.hash));
- if (query == "undefined") {
- hideResults();
- return;
+ // Exit if the hash isn't a search query or there's an error in the query
+ if ((location.hash.indexOf("q=") == -1) || (query == "undefined")) {
+ // If the results pane is open, close it.
+ if (!$("#searchResults").is(":hidden")) {
+ hideResults();
+ }
+ return;
}
+
+ // Otherwise, we have a search to do
+ var query = decodeURI(getQuery(location.hash));
searchControl.execute(query);
$('#searchResults').slideDown('slow');
$("#search_autocomplete").focus();
diff --git a/tools/droiddoc/templates-sdk/components/masthead.cs b/tools/droiddoc/templates-sdk/components/masthead.cs
index 39293fb..51759bc 100644
--- a/tools/droiddoc/templates-sdk/components/masthead.cs
+++ b/tools/droiddoc/templates-sdk/components/masthead.cs
@@ -28,16 +28,22 @@
<div class="morehover" id="moremenu">
<div class="top"></div>
<div class="mid">
+ <div class="header">Links</div>
+ <ul>
+ <li><a href="https://play.google.com/apps/publish/">Google Play Developer Console</a></li>
+ <li><a href="http://android-developers.blogspot.com/">Android Developers Blog</a></li>
+ <li><a href="<?cs var:toroot ?>about/index.html">About Android</a></li>
+ </ul>
<div class="header">Android Sites</div>
<ul>
<li><a href="http://www.android.com">Android.com</a></li>
<li class="active"><a>Android Developers</a></li>
<li><a href="http://source.android.com">Android Open Source Project</a></li>
</ul>
- <div class="header">Support</div>
+ <!-- <div class="header">Support</div>
<ul>
<li><a href="<?cs var:toroot ?>support.html">Developer Support</a></li>
- </ul>
+ </ul> -->
<div class="header">Languages</div>
<div id="language" class="locales">
<select name="language" onChange="changeLangPref(this.value, true)">
