diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/sdk/installing/studio.jd | 39 | ||||
| -rw-r--r-- | docs/html/training/displaying-bitmaps/process-bitmap.jd | 3 |
2 files changed, 28 insertions, 14 deletions
diff --git a/docs/html/sdk/installing/studio.jd b/docs/html/sdk/installing/studio.jd index f19e8bc..ceaa70a 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/install/0.3.2/android-studio-bundle-132.893413-windows.exe"> - android-studio-bundle-132.893413-windows.exe + href="http://dl.google.com/android/studio/install/0.4.2/android-studio-bundle-133.970939-windows.exe"> + android-studio-bundle-133.970939-windows.exe </a> </td> - <td>484345454 bytes</td> - <td>14cbf0109a822688f4e2f886c0b0c85a</td> + <td>515261701 bytes</td> + <td>1e1ae28b1c00f43d55f17ee35bd4f5d2</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/install/0.3.2/android-studio-bundle-132.893413-mac.dmg"> - android-studio-bundle-132.893413-mac.dmg + href="http://dl.google.com/android/studio/install/0.4.2/android-studio-bundle-133.970939-mac.dmg"> + android-studio-bundle-133.970939-mac.dmg </a> </td> - <td>463332508 bytes</td> - <td>0cd4ac59864890f7de57314bcc7ea5aa</td> + <td>491773471 bytes</td> + <td>6753f67c56acb17617bfbc5bc56384e7</td> </tr> <tr> <td>Linux</td> <td> <a onclick="return onDownload(this)" id="linux-studio" - href="http://dl.google.com/android/studio/install/0.3.2/android-studio-bundle-132.893413-linux.tgz"> - android-studio-bundle-132.893413-linux.tgz + href="http://dl.google.com/android/studio/install/0.4.2/android-studio-bundle-133.970939-linux.tgz"> + android-studio-bundle-133.970939-linux.tgz </a> </td> - <td>487694946 bytes</td> - <td>9f1306100314b03ff5b691b94f154501</td> + <td>516080363 bytes</td> + <td>25455787d76e61baf34bf93eaa00ded6</td> </tr> </table> @@ -424,6 +424,19 @@ style="vertical-align:bottom;margin:0;height:19px" /> in the toolbar.</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.4.2</a> <em>(Jan 2014)</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.3.2</a> <em>(Oct 2013)</em> </p> @@ -618,7 +631,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.3.2</span>" + $('#download-ide-button').append("Download Android Studio <span class='small'>v0.4.2</span>" + "<br/> <span class='small'>for " + os + "</span>"); $('#download-ide-button').click(function() {return onDownload(this,true);}).attr('href', bundlename); diff --git a/docs/html/training/displaying-bitmaps/process-bitmap.jd b/docs/html/training/displaying-bitmaps/process-bitmap.jd index 272b8bc..ed0b368 100644 --- a/docs/html/training/displaying-bitmaps/process-bitmap.jd +++ b/docs/html/training/displaying-bitmaps/process-bitmap.jd @@ -172,7 +172,8 @@ public static boolean cancelPotentialWork(int data, ImageView imageView) { if (bitmapWorkerTask != null) { final int bitmapData = bitmapWorkerTask.data; - if (bitmapData != data) { + // If bitmapData is not yet set or it differs from the new data + if (bitmapData == 0 || bitmapData != data) { // Cancel previous task bitmapWorkerTask.cancel(true); } else { |