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

Commit 7def6026 authored by Joe Fernandez's avatar Joe Fernandez Committed by Android Git Automerger
Browse files

am 285859b1: am d36dbe09: am e961d0b5: Merge "Revert "docs: Update for Android... 

am 285859b1: am d36dbe09: am e961d0b5: Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs

* commit '285859b1':
  Revert "docs: Update for Android 23.0.4"
parents 9cdde5f8 285859b1

docs/html/preview/setup-sdk.jd

+2 −9
Original line number Diff line number Diff line
@@ -202,16 +202,10 @@ to flash the following devices: 
  <li>Nexus 7 Wi-Fi (version 2, released in 2013)</li>

</ul>



<p>In addition, you also get the emulator system images, which include

<p>In addition, you also get the emulator system images, which includes

experimental 64-bit system images along with standard 32-bit system images.

</p>



<p class="note"><strong>Note:</strong> The 64-bit system images require the

Intel x86 Emulator Accelerator (HAXM) Rev.5 which can be downloaded from the

<a href="{@docRoot}tools/help/sdk-manager.html">SDK Manager</a><em>Extras</em> 

folder.</p>





<h3 id="installImage">Install the L Preview System Image</h3>



<p class="warning"><b>Warning:</b> This is a preview version of the Android
@@ -224,7 +218,6 @@ can cause your phone and installed services and applications to stop working. 
</p>







<ol>

  <li>Download and uncompress the Android Developer Preview package.

    <table style="width:860px">

docs/html/sdk/installing/installing-adt.jd

+4 −4
Original line number Diff line number Diff line 
page.title=Installing the Eclipse Plugin

adt.zip.version=23.0.4

adt.zip.download=ADT-23.0.4.zip

adt.zip.bytes=103336810

adt.zip.checksum=91a43dcf686ab73dec2c08b77243492b

adt.zip.version=23.0.3

adt.zip.download=ADT-23.0.3.zip

adt.zip.bytes=103321934

adt.zip.checksum=ab2f5e2fbbdddeeb7dfd02cd4046538a



@jd:body

docs/html/tools/sdk/eclipse-adt.jd

+0 −35
Original line number Diff line number Diff line
@@ -53,44 +53,9 @@ the ADT Plugin, as denoted by revision number. </p> 
<p>For a summary of all known issues in ADT, see <a

href="http://tools.android.com/knownissues">http://tools.android.com/knownissues</a>.</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=""/>ADT 23.0.4</a> <em>(October 2014)</em>

  </p>



  <div class="toggle-content-toggleme">

<dl>

  <dt>Dependencies:</dt>



  <dd>

    <ul>

      <li>Java 7 or higher is required if you are targeting the L Developer Preview.</li>

      <li>Java 1.6 or higher is required if you are targeting other releases.</li>

      <li>Eclipse Indigo (Version 3.7.2) or higher is required.</li>

      <li>This version of ADT is designed for use with

        <a href="{@docRoot}tools/sdk/tools-notes.html">SDK Tools r23.0.4</a>.

        If you haven't already installed SDK Tools r23.0.4 into your SDK, use the

        Android SDK Manager to do so.</li>

    </ul>

  </dd>



  <dt>General Notes:</dt>

  <dd>

    <ul>

        <li>Fixed duplicate devices in AVD for Wear and TV.</li>

    </ul>

  </dd>

</dl>

</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=""/>ADT 23.0.3</a> <em>(August 2014)</em>

  </p>

docs/html/tools/sdk/tools-notes.jd

+0 −32
Original line number Diff line number Diff line
@@ -28,38 +28,6 @@ href="http://tools.android.com/knownissues">http://tools.android.com/knownissues 
<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=""/>SDK Tools, Revision 23.0.4</a> <em>(October 2014)</em>

  </p>



  <div class="toggle-content-toggleme">



    <dl>

    <dt>Dependencies:</dt>



    <dd>

      <ul>

        <li>Android SDK Platform-tools revision 19 or later.</li>

        <li>If you are developing in Eclipse with ADT, note that this version of SDK Tools is

          designed for use with ADT 23.0.4 and later. If you haven't already, update your

        <a href="{@docRoot}tools/sdk/eclipse-adt.html">ADT Plugin</a> to 23.0.4.</li>

        <li>If you are developing outside Eclipse, you must have

          <a href="http://ant.apache.org/">Apache Ant</a> 1.8 or later.</li>

      </ul>

    </dd>



    <dt>General Notes:</dt>

    <dd>

      <ul>

        <li>Fixed duplicate devices in AVD for Wear and TV.</li>

      </ul>

    </dd>

  </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=""/>SDK Tools, Revision 23.0.2</a> <em>(July 2014)</em>

  </p>