Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev
diff --git a/docs/html/sdk/installing/studio.jd b/docs/html/sdk/installing/studio.jd
index f3e181e..791f675 100644
--- a/docs/html/sdk/installing/studio.jd
+++ b/docs/html/sdk/installing/studio.jd
@@ -22,7 +22,7 @@
<h3>1. Introduction</h3>
1.1 The Android Software Development Kit (referred to in this License Agreement as the "SDK" and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK.
-1.2 “Android” means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.
+1.2 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.
1.3 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
@@ -231,16 +231,12 @@
<a href="{@docRoot}sdk/index.html">ADT Bundle</a> (Eclipse with the ADT Plugin).</p>
-
-
<h4 style="clear:right;text-align:right;margin-right:50px"><a href='' class="expandable"
onclick="toggleExpandable(this,'.pax');return false;"
>DOWNLOAD FOR OTHER PLATFORMS</a></h4>
-
<div class="pax col-13 online" style="display:none;margin:0;">
-<p class="table-caption"> <strong>Android Studio v0.1</strong></p>
<table class="download">
<tr>
<th>Platform</th>
@@ -253,36 +249,36 @@
<td>Windows</td>
<td>
<a onclick="return onDownload(this)" id="win-studio"
- href="http://dl.google.com/android/studio/android-studio-bundle-130.677228-windows.exe">
+ href="http://dl.google.com/android/studio/android-studio-bundle-130.687321-windows.exe">
android-studio-bundle-130.677228-windows.exe
</a>
</td>
- <td>382109250 bytes</td>
- <td>eb90d50a6ccd975bf19c6930c2006300</td>
+ <td>393023485 bytes</td>
+ <td>3da987a9778b66edb68fb43d8b53bfcb</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.677228-mac.dmg">
- android-studio-bundle-130.677228-mac.dmg
+ href="http://dl.google.com/android/studio/android-studio-bundle-130.687321-mac.dmg">
+ android-studio-bundle-130.687321-mac.dmg
</a>
</td>
- <td>371607412 bytes</td>
- <td>119e8e7170f451bec82cfa321e53d780</td>
+ <td>379877697 bytes</td>
+ <td>eb5ca6c77f4a119595d941daeda58810</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.677228-linux.tgz">
- android-studio-bundle-130.677228-linux.tgz
+ href="http://dl.google.com/android/studio/android-studio-bundle-130.687321-linux.tgz">
+ android-studio-bundle-130.687321-linux.tgz
</a>
</td>
- <td>400487529 bytes</td>
- <td>62b9ce75e4b74b7c1236ea2f1f99da34</td>
+ <td>406516375 bytes</td>
+ <td>6796d66de07c85b2822ca8d501a043c0</td>
</tr>
</table>
@@ -290,11 +286,6 @@
-
-
-
-
-
<h2 id="Installing">Installing Android Studio</h2>
<ol>
<li>Download the <strong>Android Studio</strong> package from above.</li>
@@ -397,6 +388,24 @@
+<h2 id="Revisions">Revisions</h2>
+
+<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>
+ </p>
+
+ <div class="toggle-content-toggleme">
+ <ul>
+ <li>Various bug fixes, including a fix for a common Windows installation issue.
+ </ul>
+ </div>
+</div>
+
+
+
+
@@ -436,7 +445,8 @@
if (os) {
/* set up primary ACE download button */
$('#download-ide-button').show();
- $('#download-ide-button').append("Download Android Studio v0.1 <br/><span class='small'>for " + os + "</span>");
+ $('#download-ide-button').append("Download Android Studio <span class='small'>v0.1.1</span>"
+ + "<br/><span class='small'>for " + os + "</span>");
$('#download-ide-button').click(function() {return onDownload(this,true);}).attr('href', bundlename);
} else {