Merge "docs: fix search suggestions and other script bugs for offline docs" into jb-dev
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 021617d..b3e3c6e 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -41,7 +41,7 @@
# which is the version that we reveal to the end user.
# Update this value when the platform version changes (rather
# than overriding it somewhere else). Can be an arbitrary string.
- PLATFORM_VERSION := 4.1
+ PLATFORM_VERSION := 4.1.1
endif
ifeq "" "$(PLATFORM_SDK_VERSION)"
@@ -96,4 +96,3 @@
# anyone trying to parse it as an integer will probably get "0".
BUILD_NUMBER := eng.$(USER).$(shell date +%Y%m%d.%H%M%S)
endif
-
diff --git a/tools/droiddoc/templates-sdk/sdkpage.cs b/tools/droiddoc/templates-sdk/sdkpage.cs
index 17c1354..c0f3be7 100644
--- a/tools/droiddoc/templates-sdk/sdkpage.cs
+++ b/tools/droiddoc/templates-sdk/sdkpage.cs
@@ -210,11 +210,12 @@
}
if (os) {
- $('#download-button').text("Download the SDK for " + os).removeClass("disabled");
+ $('#not-supported').hide();
+ $('#download-button').show();
+ $('#download-button').text("Download the SDK for " + os);
$('#download-button').click(function() {onDownload($link.get());}).attr('href', $link.attr('href'));
} else {
$('.pax').show();
- $('#download-button').css({'font-size':'14px'});
}
</script>