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

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

am 03dd6845: am 04b393a8: am d35b8587: am 5e5af93b: remove preview system image links bug: 18376658 

automerge: 55c741a7

* commit '55c741a7':
  remove preview system image links bug: 18376658
parents 19e1512d 55c741a7

docs/html/about/versions/android-5.0.jd

+0 −8
Original line number Diff line number Diff line
@@ -141,14 +141,6 @@ highlights</a>.</p> 
the Android SDK</a>. Then use the <a href="{@docRoot}tools/help/sdk-manager.html">SDK Manager</a>

to download the Android 5.0 SDK Platform and System Images.</p>



<p style="

    padding: 10px;

    background: #eee;

    width: 445px;

    border: 1px solid #ccc;

    margin-top: 20px;

">To test your apps on a real device, flash a Nexus 5 or Nexus 7 with the <br>

<a href="/preview/index.html#Start"><b>ANDROID PREVIEW SYSTEM IMAGE</b></a>.</p>



<h3 id="ApiLevel">Update your target API level</h3>

docs/html/about/versions/lollipop.jd

+0 −10
Original line number Diff line number Diff line
@@ -57,16 +57,6 @@ about Android 5.0 for consumers at 






<p style="

    padding: 10px;

    background: #eee;

    width: 250px;

    border: 1px solid #ccc;

    margin-top: 20px;

">To test your apps on a real device, flash a Nexus 5 or Nexus 7 with the <br>

<a href="/preview/index.html#Start"><b>ANDROID PREVIEW SYSTEM IMAGE</b></a>.</p>





<h2 id="Material">Material design</h2>



<p>Android 5.0 brings <a href="http://www.google.com/design/spec">Material design</a> to Android and gives you an expanded UI toolkit for integrating the new design patterns easily in your apps.  </p>

docs/html/preview/index.html

+4 −40
Original line number Diff line number Diff line
@@ -332,47 +332,11 @@ you should update now to test your apps and take advantage of new features.</p> 
          to <code>"21"</code>, so you can upload your updated apps today.</li>

      </ul>



      <p>Although the APIs for Android 5.0 are now final, the system image for end-users

        is not available yet. So the following preview system images are available for you to

        test your apps on a Nexus 5 or Nexus 7. These are non-final

        builds and their use is governed by the <a href="/preview/license.html">Android L

        Preview License Agreement</a>.</p>



          <table >

            <tbody><tr>

              <th scope="col">Device</th>

              <th scope="col">Download</th>

              <th scope="col">Checksum</th>

            </tr>

            <tr id="hammerhead">

              <td>Nexus 5 (GSM/LTE) <br>"hammerhead"</td>

              <td><a href="#download" onclick="onDownload(this)">hammerhead-lpx13d-preview-f7596f51.tgz</a></td>

              <td>MD5: <code>8d92596aa038203fc6c8ff40a0e8b560</code>

              <br>SHA-1: <code>f7596f518a8a429f03de5bf8152fa90e738228dd</code></td>

            </tr>

            <tr id="razor">

              <td>Nexus 7 [2013] (Wi-Fi) <br>"razor"</td>

              <td><a href="#download" onclick="onDownload(this)">razor-lpx13d-preview-ae4f461f.tgz</a></td>

              <td>MD5: <code>b2c567518d203b487cb2ac28d25b0a54</code>

              <br><nobr>SHA-1: <code>ae4f461fabae5ff92eae0c252c34bb26d877e528</code></nobr></td>

            </tr>

          </tbody></table>

        </li>



        <p>For details about how to flash the system image to your device, see the

          <a href="https://developers.google.com/android/nexus/images#instructions">flashing

            instructions</a>.</p>



        <p>If you want to uninstall the preview system image and flash your device to factory

        specifications, download the appropriate image from

        <a href="http://developers.google.com/android/nexus/images">Factory Images for Nexus

          Devices</a> and follow the instructions on that page.</p>



        <p class="note"><strong>Note:</strong> When the final Android 5.0 system image becomes

          available, it will be posted on the

      <p>If you previously flashed your Nexus 5 or Nexus 7 with a preview system image, you should

        now update your device to the final factory system image.

        Download the appropriate image from

        <a href="http://developers.google.com/android/nexus/images">Factory Images for Nexus

          Devices</a> page. To continue development (and receive future system updates),

          you should update your device with that image as soon as possible.</p>

          Devices</a> and follow the flashing instructions on that page.</p>



        </div> <!-- end .wrap -->

docs/html/preview/license.html

+2 −2
Original line number Diff line number Diff line
@@ -87,8 +87,8 @@ body,html, #qv {background-color:#e9e9e9} 


<div class="jd-descr" itemprop="articleBody">

    <p>

If you are using the <a href="/preview/index.html">Android SDK

Preview</a>, you must agree to the following terms

If you are using the Android SDK

Preview, you must agree to the following terms

and conditions. As described below, please note that the preview version of the

Android SDK is subject to change, and that you use it at your own risk.  The

Android SDK Preview is not a stable release, and may contain errors and defects