diff --git a/tools/droiddoc/templates-sdk/sdkpage.cs b/tools/droiddoc/templates-sdk/sdkpage.cs index 52aa587164..995126b955 100644 --- a/tools/droiddoc/templates-sdk/sdkpage.cs +++ b/tools/droiddoc/templates-sdk/sdkpage.cs @@ -264,74 +264,16 @@ -
If you prefer to use a different IDE or run the tools from the +command line or with build scripts, you can instead download the stand-alone Android SDK Tools. +These packages provide the basic SDK tools for app development, without an IDE. +
- -Android Studio Bundle
-SDK Tools Only
Platform | @@ -340,7 +282,7 @@MD5 Checksum | ||
---|---|---|---|
Windows 32 & 64-bit |
+ Windows | @@ -359,7 +301,7 @@ var:sdk.win_installer | |
32 & 64-bit |
+
ADT Bundle
+
+All Android Studio Packages+ +Select a specific Android Studio package for your platform. +with the Android SDK for " + os + ""); - $('#download-bundle-button').click(function() {return onDownload(this,true,true);}).attr('href', bundlename); - - /* set up sdk tools only button */ - $('#download-tools-button').show(); - $('#download-tools-button').append("Download the stand-alone Android SDK Tools for " + os); - $('#download-tools-button').click(function() {return onDownload(this,true);}).attr('href', $toolslink.attr('href')); - } else { - $('.pax').show(); + $('.download-bundle-button').append(" for " + os + ""); + $('.download-bundle-button').click(function() {return onDownload(this,true,true);}).attr('href', bundlename); } @@ -502,44 +426,29 @@ var:sdk.linux_download $("#downloadForRealz").html("Download " + $(link).text()); } - /* if it's a bundle, show the 32/64-bit picker */ - if (bundle) { - $("#downloadForRealz").attr('Eclipse ADT Bundle','true'); - if ($("#downloadForRealz").text().indexOf("Mac") == -1) { - $("p#bitpicker").show(); - } else { - /* mac is always 64 bit, so set it checked */ - $("p#bitpicker input[value=64]").attr('checked', true); - } - /* save link name until the bit version is chosen */ - $("#downloadForRealz").attr('name',$(link).attr('href')); - } else { - /* if not using bundle, set download button to ignore bitpicker and set url */ - $("#downloadForRealz").attr('bundle','false'); - $("#downloadForRealz").attr('href',$(link).attr('href')); - /* set picker checked as a fake default */ - $("p#bitpicker input[value=64]").attr('checked', true); - $("a#next-link").html("Setting Up an Existing IDE").attr('href',toRoot + 'sdk/installing/index.html'); - } + $("#downloadForRealz").attr('bundle', bundle); + $("a#downloadForRealz").attr("name", $(link).attr('href')); - $("#tos").fadeIn('fast'); - $("#landing").fadeOut('fast'); + $("#tos").show(); + $("#landing").hide(); - location.hash = "download"; + location.hash = "top"; return false; } function onAgreeChecked() { - /* verify that the TOS is agreed and a bit version is chosen */ - if ($("input#agree").is(":checked") && $("#bitpicker input:checked").length) { + /* verify that the TOS is agreed */ + if ($("input#agree").is(":checked")) { /* if downloading the bundle */ if ($("#downloadForRealz").attr('bundle')) { - /* construct the name of the link we want based on the bit version */ - linkId = $("a#downloadForRealz").attr("name") + $("#bitpicker input:checked").val(); + /* construct the name of the link we want */ + linkId = $("a#downloadForRealz").attr("name"); /* set the real url for download */ $("a#downloadForRealz").attr("href", $(linkId).attr("href")); + } else { + $("a#downloadForRealz").attr("href", $("a#downloadForRealz").attr("name")); } /* reveal the download button */ @@ -550,25 +459,28 @@ var:sdk.linux_download } function onDownloadForRealz(link) { - if ($("input#agree").is(':checked') && $("#bitpicker input:checked").length) { + if ($("input#agree").is(':checked')) { + location.hash = ""; + location.hash = "top"; $("div.sdk-terms").slideUp(); - $("h1#tos-header").text('Now redirecting to the install instructions...'); - $("#sdk-terms-form,.sdk-terms-intro").fadeOut('slow', function() { + $("h1#tos-header").text('Now downloading...'); + $(".sdk-terms-intro").text('You\'ll be redirected to the install instructions in a moment.'); + $("#sdk-terms-form").fadeOut('slow', function() { setTimeout(function() { if ($("#downloadForRealz").attr('bundle') == 'true') { - // User downloaded the ADT Bundle - window.location = "/sdk/installing/index.html?pkg=adt"; + // User downloaded the studio Bundle + window.location = "/sdk/installing/index.html?pkg=studio"; } else { // User downloaded the SDK Tools window.location = "/sdk/installing/index.html?pkg=tools"; } - }, 500); + }, 3000); }); ga('send', 'event', 'SDK', 'IDE and Tools', $("#downloadForRealz").html()); return true; } else { - $("label#agreeLabel,#bitpicker input").parent().stop().animate({color: "#258AAF"}, 200, - function() {$("label#agreeLabel,#bitpicker input").parent().stop().animate({color: "#222"}, 200)} + $("label#agreeLabel").parent().stop().animate({color: "#258AAF"}, 200, + function() {$("label#agreeLabel").parent().stop().animate({color: "#222"}, 200)} ); return false; } |