summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiva Velusamy <vsiva@google.com>2013-10-25 18:42:42 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-25 18:42:42 -0700
commit334d98f1ece949414b94924a5bc852810e0bf367 (patch)
tree3e75155bef1ec3b0e62e4de12c62e655fdda276c
parent6364c26cb385ea654b7c8af8a1ef2f5cb4a556c2 (diff)
parent9e4514cd06592dc5cc81638699dc9d17065d42d2 (diff)
downloadframeworks_base-334d98f1ece949414b94924a5bc852810e0bf367.zip
frameworks_base-334d98f1ece949414b94924a5bc852810e0bf367.tar.gz
frameworks_base-334d98f1ece949414b94924a5bc852810e0bf367.tar.bz2
am 9e4514cd: am 4062ae2e: am 3ebe71cb: Update AS download page for v0.3.1
* commit '9e4514cd06592dc5cc81638699dc9d17065d42d2': Update AS download page for v0.3.1
-rw-r--r--docs/html/sdk/installing/studio.jd59
1 files changed, 33 insertions, 26 deletions
diff --git a/docs/html/sdk/installing/studio.jd b/docs/html/sdk/installing/studio.jd
index 3399ee8..f2fd79b 100644
--- a/docs/html/sdk/installing/studio.jd
+++ b/docs/html/sdk/installing/studio.jd
@@ -253,36 +253,36 @@ download (or continue to use) the
<td>Windows</td>
<td>
<a onclick="return onDownload(this)" id="win-studio"
- href="http://dl.google.com/android/studio/android-studio-bundle-130.737825-windows.exe">
- android-studio-bundle-130.737825-windows.exe
+ href="http://dl.google.com/android/studio/android-studio-bundle-132.883541-windows.exe">
+ android-studio-bundle-132.883541-windows.exe
</a>
</td>
- <td>396091268 bytes</td>
- <td>6da1bc8effa048c8ff669e4c484eb11f</td>
+ <td>448245492 bytes</td>
+ <td>ca5f5c4d21b4350ddf3bda7021a6ee5e</td>
</tr>
<tr>
<td><nobr>Mac OS X</nobr></td>
<td>
<a onclick="return onDownload(this)" id="mac-studio"
- href="http://dl.google.com/android/studio/android-studio-bundle-130.737825-mac.dmg">
- android-studio-bundle-130.737825-mac.dmg
+ href="http://dl.google.com/android/studio/android-studio-bundle-132.883541-mac.dmg">
+ android-studio-bundle-132.883541-mac.dmg
</a>
</td>
- <td>383326582 bytes</td>
- <td>2959bc5039238d286670cc6225342b89</td>
+ <td>427317993 bytes</td>
+ <td>67831af6e7896a0a146d43423fabb542</td>
</tr>
<tr>
<td>Linux</td>
<td>
<a onclick="return onDownload(this)" id="linux-studio"
- href="http://dl.google.com/android/studio/android-studio-bundle-130.737825-linux.tgz">
- android-studio-bundle-130.737825-linux.tgz
+ href="http://dl.google.com/android/studio/android-studio-bundle-132.883541-linux.tgz">
+ android-studio-bundle-132.883541-linux.tgz
</a>
</td>
- <td>409935592 bytes</td>
- <td>dcd13922f7cf577e3c852b224205d843</td>
+ <td>451652493 bytes</td>
+ <td>7a6f9b12b2cd5321ab0818b51306e01c</td>
</tr>
</table>
@@ -290,9 +290,13 @@ download (or continue to use) the
-<h2 id="Updating">Updating to 0.2.x</h2>
+<h2 id="Updating">Updating from older versions</h2>
-<p>To update from Android Studio 0.1.x to 0.2.x,
+<p>If you already have Android Studio installed, in most cases, you can upgrade to the latest
+version by installing a patch. From within Android Studio, select
+<strong>Help &gt; Check for updates</strong> to see whether an update is available.</p>
+
+<p>If an update is not available,
follow the <a href="#Installing">installation instructions</a> below and replace your existing
installation.</p>
@@ -304,13 +308,10 @@ SDK directory under Android Studio to a temporary location
before installing the update. Then move them back once the update is complete.
If you fail to copy these packages, then you can instead download them again through
the Android SDK Manager.</p>
-<p><strong>Windows users:</strong> Do not install Android Studio 0.2.x in the same
-location as 0.1.x. Doing so may cause errors such as ClassCastException or other unexpected
-behaviors. It's best if you remove your previous version of Android Studio 0.1.x.</p>
</div>
-<p>Also note that due to the update to Gradle 0.5, you will encounter errors when opening
+<p>Also note that due to the update to Android Gradle Plugin 0.6, you will encounter errors when opening
existing projects. See the <a href="#Troubleshooting">Troubleshooting</a> notes below for
information about how to resolve them.</p>
@@ -419,16 +420,22 @@ style="vertical-align:bottom;margin:0;height:19px" /> in the toolbar.</p>
<h2 id="Revisions">Revisions</h2>
-<p class="note"><strong>Note:</strong> <strong>There is not a patch update available from
-0.1.9 to 0.2</strong>. To update from Android Studio 0.1.x to 0.2.x, you must
-install a new Android Studio bundle from this page. The reason for that is that we have made
-changes to the bundled SDK such that it includes a pre-configured local Maven repository
-which can serve up the v4 support library and which is required for creating new projects.</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.3.1</a> <em>(Oct 2013)</em>
+ </p>
+
+ <div class="toggle-content-toggleme">
+ <ul>
+ <li>See <a href="http://tools.android.com/recent">tools.android.com</a> for a full list of changes.</li>
+ </ul>
+ </div>
+</div>
+
+<div class="toggle-content closed">
+ <p><a href="#" onclick="return toggleContent(this)">
+ <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img"
alt=""/>Android Studio v0.2.x</a> <em>(July 2013)</em>
</p>
@@ -610,7 +617,7 @@ for possible resolutions to known issues: <a href="http://tools.android.com/know
if (os) {
/* set up primary ACE download button */
$('#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.3.1</span>"
+ "<br/> <span class='small'>for " + os + "</span>");
$('#download-ide-button').click(function() {return onDownload(this,true);}).attr('href', bundlename);