summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2013-06-14 10:16:02 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-14 10:16:02 -0700
commit6e5942894a40ed2a199f25bf4e8a215c95d2c79b (patch)
tree642decccb684f3c049231b3a0bbeee318934c20f /docs
parentf1d2c5aeb23739bde3708f4e4d4bdb99f059f1ed (diff)
parentd2ad6dc5304e5c3a4f0dc1bd04f7ab713ed66c6d (diff)
downloadframeworks_base-6e5942894a40ed2a199f25bf4e8a215c95d2c79b.zip
frameworks_base-6e5942894a40ed2a199f25bf4e8a215c95d2c79b.tar.gz
frameworks_base-6e5942894a40ed2a199f25bf4e8a215c95d2c79b.tar.bz2
am d2ad6dc5: am 6af13a74: am ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins
* commit 'd2ad6dc5304e5c3a4f0dc1bd04f7ab713ed66c6d': change studio version number to use 'x' for final decimal. also go to install guide after download begins
Diffstat (limited to 'docs')
-rw-r--r--docs/html/sdk/installing/studio.jd15
1 files changed, 11 insertions, 4 deletions
diff --git a/docs/html/sdk/installing/studio.jd b/docs/html/sdk/installing/studio.jd
index 791f675..1ed84bd 100644
--- a/docs/html/sdk/installing/studio.jd
+++ b/docs/html/sdk/installing/studio.jd
@@ -390,10 +390,15 @@ style="vertical-align:bottom;margin:0;height:19px" /> in the toolbar.</p>
<h2 id="Revisions">Revisions</h2>
+<p class="note"><strong>Note:</strong> Periodic updates are pushed to Android Studio
+without requiring you to update from here. To manually check for updates, select
+<strong>Help > Check for updates</strong> (on Mac, select <strong>Android Studio >
+Check for updates</strong>).</p>
+
<div class="toggle-content opened">
<p><a href="#" onclick="return toggleContent(this)">
<img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img"
- alt=""/>Android Studio v0.1.1</a> <em>(May 2013)</em>
+ alt=""/>Android Studio v0.1.x</a> <em>(May 2013)</em>
</p>
<div class="toggle-content-toggleme">
@@ -445,7 +450,7 @@ style="vertical-align:bottom;margin:0;height:19px" /> in the toolbar.</p>
if (os) {
/* set up primary ACE download button */
$('#download-ide-button').show();
- $('#download-ide-button').append("Download Android Studio <span class='small'>v0.1.1</span>"
+ $('#download-ide-button').append("Download Android Studio <span class='small'>v0.1.x</span>"
+ "<br/><span class='small'>for " + os + "</span>");
$('#download-ide-button').click(function() {return onDownload(this,true);}).attr('href', bundlename);
@@ -489,8 +494,10 @@ style="vertical-align:bottom;margin:0;height:19px" /> in the toolbar.</p>
function onDownloadForRealz(link) {
if ($("input#agree").is(':checked')) {
$("div.sdk-terms").slideUp();
- $("#sdk-terms-form,.sdk-terms-intro").fadeOut('slow');
- $("#main").fadeIn('slow');
+ $("#sdk-terms-form,.sdk-terms-intro").fadeOut('fast');
+ $("#main").fadeIn('fast', function() {
+ location.hash = "Installing";
+ });
return true;
} else {
$("label#agreeLabel,#bitpicker input").parent().stop().animate({color: "#258AAF"}, 200,