Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 84ad0894: fix markup error in download button and fix transition to install/update guide

Browse Source 
* commit '84ad0894be13b374b9b75e204dabea6a1579e131':
  fix markup error in download button and fix transition to install/update guide
This commit is contained in:
Scott Main
2013-07-11 17:36:53 -07:00
committed by Android Git Automerger
parent 3e82a9c9a5 84ad0894be
commit 536fa1bbe1
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
docs/html/sdk/installing/studio.jd
View File

@@ -288,7 +288,7 @@ download (or continue to use) the
<h2 id="Updating">Updating to 0.2.x</h2> <h2 id="Updating">Updating to 0.2.x</h2>
<p>To update your existing version of Android Studio to 0.2.x, simply <p>To update from Android Studio 0.1.x to 0.2.x,
follow the <a href="#Installing">installation instructions</a> below and replace your existing follow the <a href="#Installing">installation instructions</a> below and replace your existing
installation.</p> installation.</p>
@@ -597,7 +597,7 @@ and install <strong>Android Studio Repository</strong>.</li>
/* set up primary ACE download button */ /* set up primary ACE download button */
$('#download-ide-button').show(); $('#download-ide-button').show();
$('#download-ide-button').append("Download Android Studio <span class='small'>v0.2.x</span>" $('#download-ide-button').append("Download Android Studio <span class='small'>v0.2.x</span>"
+ "<br/><span class='small'>for " + os + "</span>"); + "<br/> <span class='small'>for " + os + "</span>");
$('#download-ide-button').click(function() {return onDownload(this,true);}).attr('href', bundlename); $('#download-ide-button').click(function() {return onDownload(this,true);}).attr('href', bundlename);
} else { } else {
@@ -639,10 +639,9 @@ and install <strong>Android Studio Repository</strong>.</li>
function onDownloadForRealz(link) { function onDownloadForRealz(link) {
if ($("input#agree").is(':checked')) { if ($("input#agree").is(':checked')) {
$("div.sdk-terms,#sdk-terms-form,.sdk-terms-intro").hide(); $("#tos").hide();
$("#main").show(function() { $("#main").show();
location.hash = "Installing"; location.hash = "Updating";
});
return true; return true;
} else { } else {
$("label#agreeLabel,#bitpicker input").parent().stop().animate({color: "#258AAF"}, 200, $("label#agreeLabel,#bitpicker input").parent().stop().animate({color: "#258AAF"}, 200,