Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 382e60f1 authored by smain@google.com's avatar smain@google.com Committed by android-build-merger
Browse files

resolve merge conflicts of 0e7d1437 to nyc-dev 

am: 089e4bbc

* commit '089e4bbc':
  change order of windows downloads

Change-Id: Idc9ead41fb6e6bc907646bf655f767894d5760d2
parents da96f292 089e4bbc

tools/droiddoc/templates-sdk-dev/sdkpage.cs

+12 −12
Original line number Diff line number Diff line
@@ -304,26 +304,26 @@ 
  <tr>

    <!-- blank TD from Windows rowspan -->

    <td>

  <a onclick="return onDownload(this,false,true)" id="win-bundle-zip" data-modal-toggle="studio_tos"

    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><br>

  <a onclick="return onDownload(this,false,true)" id="win-bundle-notools" data-modal-toggle="studio_tos"

    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 Android SDK

    </td>

    <td><?cs call:size_in_mb(studio.win_bundle_bytes) ?> MB

      <br>(<?cs var:studio.win_bundle_bytes ?> bytes)</td>

    <td><?cs var:studio.win_bundle_checksum ?></td>

    <td><?cs call:size_in_mb(studio.win_notools_exe_bytes) ?> MB

      <br>(<?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,false,true)" id="win-bundle-notools" data-modal-toggle="studio_tos"

    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>

  <a onclick="return onDownload(this,false,true)" id="win-bundle-zip" data-modal-toggle="studio_tos"

    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><br>

    No Android SDK, no installer

    </td>

    <td><?cs call:size_in_mb(studio.win_notools_exe_bytes) ?> MB

      <br>(<?cs var:studio.win_notools_exe_bytes ?> bytes)</td>

    <td><?cs var:studio.win_notools_exe_checksum ?></td>

    <td><?cs call:size_in_mb(studio.win_bundle_bytes) ?> MB

      <br>(<?cs var:studio.win_bundle_bytes ?> bytes)</td>

    <td><?cs var:studio.win_bundle_checksum ?></td>

  </tr>

  <tr>

    <td><nobr>Mac OS X</nobr></td>

tools/droiddoc/templates-sdk/sdkpage.cs

+12 −12
Original line number Diff line number Diff line
@@ -304,26 +304,26 @@ 
  <tr>

    <!-- blank TD from Windows rowspan -->

    <td>

  <a onclick="return onDownload(this,false,true)" id="win-bundle-zip" data-modal-toggle="studio_tos"

    href="//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><br>

  <a onclick="return onDownload(this,false,true)" id="win-bundle-notools" data-modal-toggle="studio_tos"

    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 Android SDK

    </td>

    <td><?cs call:size_in_mb(studio.win_bundle_bytes) ?> MB

      <br>(<?cs var:studio.win_bundle_bytes ?> bytes)</td>

    <td><?cs var:studio.win_bundle_checksum ?></td>

    <td><?cs call:size_in_mb(studio.win_notools_exe_bytes) ?> MB

      <br>(<?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,false,true)" id="win-bundle-notools" data-modal-toggle="studio_tos"

    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>

  <a onclick="return onDownload(this,false,true)" id="win-bundle-zip" data-modal-toggle="studio_tos"

    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><br>

    No Android SDK, no installer

    </td>

    <td><?cs call:size_in_mb(studio.win_notools_exe_bytes) ?> MB

      <br>(<?cs var:studio.win_notools_exe_bytes ?> bytes)</td>

    <td><?cs var:studio.win_notools_exe_checksum ?></td>

    <td><?cs call:size_in_mb(studio.win_bundle_bytes) ?> MB

      <br>(<?cs var:studio.win_bundle_bytes ?> bytes)</td>

    <td><?cs var:studio.win_bundle_checksum ?></td>

  </tr>

  <tr>

    <td><nobr>Mac OS X</nobr></td>