summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsmain@google.com <smain@google.com>2014-12-07 22:39:24 -0800
committersmain@google.com <smain@google.com>2014-12-07 22:39:24 -0800
commit102db8b58bd51aeaa7409924d5dc341f2f72b892 (patch)
tree2e449f7d675fbcfbc7f6b17209cf70a42eb21579
parentd53f0660f1fe40921d72b75abb9bfeee534b6b8c (diff)
downloadbuild-102db8b58bd51aeaa7409924d5dc341f2f72b892.zip
build-102db8b58bd51aeaa7409924d5dc341f2f72b892.tar.gz
build-102db8b58bd51aeaa7409924d5dc341f2f72b892.tar.bz2
update sdk template with new studio downloads
Change-Id: Iee43f4f4eb5c63d94884a463a73fc016b5a05c4e
-rw-r--r--tools/droiddoc/templates-sdk/sdkpage.cs44
1 files changed, 33 insertions, 11 deletions
diff --git a/tools/droiddoc/templates-sdk/sdkpage.cs b/tools/droiddoc/templates-sdk/sdkpage.cs
index 995126b..7a02193 100644
--- a/tools/droiddoc/templates-sdk/sdkpage.cs
+++ b/tools/droiddoc/templates-sdk/sdkpage.cs
@@ -284,15 +284,6 @@ These packages provide the basic SDK tools for app development, without an IDE.
<tr>
<td rowspan="2">Windows</td>
<td>
- <a onclick="return onDownload(this)" href="http://dl.google.com/android/<?cs var:sdk.win_download
-?>"><?cs var:sdk.win_download ?></a>
- </td>
- <td><?cs var:sdk.win_bytes ?> bytes</td>
- <td><?cs var:sdk.win_checksum ?></td>
- </tr>
- <tr>
- <!-- blank TD from Windows rowspan -->
- <td>
<a onclick="return onDownload(this)" id="win-tools" href="http://dl.google.com/android/<?cs
var:sdk.win_installer
?>"><?cs var:sdk.win_installer ?></a> (Recommended)
@@ -301,6 +292,15 @@ var:sdk.win_installer
<td><?cs var:sdk.win_installer_checksum ?></td>
</tr>
<tr>
+ <!-- blank TD from Windows rowspan -->
+ <td>
+ <a onclick="return onDownload(this)" href="http://dl.google.com/android/<?cs var:sdk.win_download
+?>"><?cs var:sdk.win_download ?></a>
+ </td>
+ <td><?cs var:sdk.win_bytes ?> bytes</td>
+ <td><?cs var:sdk.win_checksum ?></td>
+ </tr>
+ <tr>
<td><nobr>Mac OS X</nobr></td>
<td>
<a onclick="return onDownload(this)" id="mac-tools" href="http://dl.google.com/android/<?cs
@@ -337,9 +337,31 @@ var:sdk.linux_download
</tr>
<tr>
- <td>Windows</td>
+ <td rowspan="3">Windows</td>
<td>
<a onclick="return onDownload(this)" id="win-bundle"
+ href="https://dl.google.com/dl/android/studio/install/<?cs var:studio.version ?>/<?cs var:studio.win_bundle_exe_download ?>"
+ ><?cs var:studio.win_bundle_exe_download ?></a><br>(Recommended)
+ </td>
+ <td><?cs var:studio.win_bundle_exe_bytes ?> bytes</td>
+ <td><?cs var:studio.win_bundle_exe_checksum ?></td>
+ </tr>
+
+ <tr>
+ <!-- blank TD from Windows rowspan -->
+ <td>
+ <a onclick="return onDownload(this)"
+ href="https://dl.google.com/dl/android/studio/install/<?cs var:studio.version ?>/<?cs var:studio.win_notools_exe_download ?>"
+ ><?cs var:studio.win_notools_exe_download ?></a><br>(No SDK tools included)
+ </td>
+ <td><?cs var:studio.win_notools_exe_bytes ?> bytes</td>
+ <td><?cs var:studio.win_notools_exe_checksum ?></td>
+ </tr>
+
+ <tr>
+ <!-- blank TD from Windows rowspan -->
+ <td>
+ <a onclick="return onDownload(this)"
href="https://dl.google.com/dl/android/studio/ide-zips/<?cs var:studio.version ?>/<?cs var:studio.win_bundle_download ?>"
><?cs var:studio.win_bundle_download ?></a>
</td>
@@ -351,7 +373,7 @@ var:sdk.linux_download
<td><nobr>Mac OS X</nobr></td>
<td>
<a onclick="return onDownload(this)" id="mac-bundle"
- href="https://dl.google.com/dl/android/studio/ide-zips/<?cs var:studio.version ?>/<?cs var:studio.mac_bundle_download ?>"
+ href="https://dl.google.com/dl/android/studio/install/<?cs var:studio.version ?>/<?cs var:studio.mac_bundle_download ?>"
><?cs var:studio.mac_bundle_download ?></a>
</td>
<td><?cs var:studio.mac_bundle_bytes ?> bytes</td>