am a0689075: Update version number for AOSP master
* commit 'a06890757028f7f8ae77a2c7616885a800aee15f':
Update version number for AOSP master
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index 7c395c7..1b80b7f 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -95,6 +95,11 @@
position: fixed;
margin:0;
top: 20px; }
+
+#devdoc-nav span.small {
+ font-size:12px;
+ font-weight:normal;
+}
#content {
width: 760px;
@@ -2274,7 +2279,7 @@
margin-bottom:0;
}
-blockquote {
+body.about blockquote {
display:block;
float:right;
width:280px;
diff --git a/tools/droiddoc/templates-sdk/assets/js/docs.js b/tools/droiddoc/templates-sdk/assets/js/docs.js
index 6ce7c56..d7ebbef 100644
--- a/tools/droiddoc/templates-sdk/assets/js/docs.js
+++ b/tools/droiddoc/templates-sdk/assets/js/docs.js
@@ -1811,13 +1811,14 @@
/* ################# JAVADOC REFERENCE ################### */
/* ######################################################## */
-/* Initialize some droiddoc stuff */
-$(document).ready(function() {
-
- // init available apis based on user pref
- changeApiLevel();
- initSidenavHeightResize()
-});
+/* Initialize some droiddoc stuff, but only if we're in the reference */
+if (location.pathname.indexOf("/reference") == 0) {
+ $(document).ready(function() {
+ // init available apis based on user pref
+ changeApiLevel();
+ initSidenavHeightResize()
+ });
+}
var API_LEVEL_COOKIE = "api_level";
var minLevel = 1;