tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am c29b3f58: changes to sdk template for new install workflow. add auto-redirect to install page after download starts.

Browse source 
* commit 'c29b3f58b0edc60ecaaedb652475fdad4ffe7bfd':
  changes to sdk template for new install workflow. add auto-redirect to install page after download starts.
This commit is contained in:
Scott Main 2014-06-12 19:04:36 +00:00 committed by Android Git Automerger
commit b7de5e8474
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tools/droiddoc/templates-sdk/assets/js/docs.js
View file

@ -63,7 +63,12 @@ $(document).ready(function() {
$('.scroll-pane').jScrollPane( {verticalGutter:0} );
// add HRs below all H2s (except for a few other h2 variants)
$('h2').not('#qv h2').not('#tb h2').not('.sidebox h2').not('#devdoc-nav h2').not('h2.norule').css({marginBottom:0}).after('<hr/>');
$('h2').not('#qv h2')
.not('#tb h2')
.not('.sidebox h2')
.not('#devdoc-nav h2')
.not('h2.norule').css({marginBottom:0})
.after('<hr/>');
// set up the search close button
$('.search .close').click(function() {

17
tools/droiddoc/templates-sdk/sdkpage.cs
View file

@ -430,7 +430,7 @@ var:sdk.linux_download
/* set up primary adt download button */
$('#download-bundle-button').show();
$('#download-bundle-button').append("Download the SDK <br/><span class='small'>ADT Bundle for " + os + "</span>");
$('#download-bundle-button').append("Download the SDK <br/><span class='small'>with the Eclipse ADT Bundle for " + os + "</span>");
$('#download-bundle-button').click(function() {return onDownload(this,true,true);}).attr('href', bundlename);
/* set up sdk tools only button */
@ -501,9 +501,18 @@ var:sdk.linux_download
function onDownloadForRealz(link) {
if ($("input#agree").is(':checked') && $("#bitpicker input:checked").length) {
$("div.sdk-terms").slideUp();
$("#sdk-terms-form,.sdk-terms-intro").fadeOut('slow');
$("#next-steps").fadeIn('slow');
$("h1#tos-header").text('Get Ready to Code!');
$("h1#tos-header").text('Now downloading ' + $(link).text() + '...');
$("#sdk-terms-form,.sdk-terms-intro").fadeOut('slow', function() {
setTimeout(function() {
if ($("#downloadForRealz").attr('bundle') == 'true') {
// User downloaded the ADT Bundle
window.location = "/sdk/installing/index.html?pkg=adt";
} else {
// User downloaded the SDK Tools
window.location = "/sdk/installing/index.html?pkg=tools";
}
}, 500);
});
_gaq.push(['_trackEvent', 'SDK', 'ADT and Tools', $("#downloadForRealz").html()]);
return true;
} else {