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

Commit a43c4777 authored by Dirk Dougherty's avatar Dirk Dougherty
Browse files

Cherrypick from honeycomb-mr2: Doc change: add HC MR2 version notes and update api level info.

parent 317ab342

docs/html/guide/appendix/api-levels.jd

+65 −14
Original line number Diff line number Diff line
@@ -82,20 +82,71 @@ API Level 1 and subsequent releases have incremented the API Level.</p> 
Android platform.</p>



<table>

  <tr><th>Platform Version</th><th>API Level</th></tr>

  <tr><td>Android 3.1</td><td>12</td></tr>

  <tr><td>Android 3.0</td><td>11</td></tr>

  <tr><td>Android 2.3.4</td><td rowspan="2">10</td></tr>

  <tr><td>Android 2.3.3</td></tr>

  <tr><td>Android 2.3</td><td>9</td></tr>

  <tr><td>Android 2.2</td><td>8</td></tr>

  <tr><td>Android 2.1</td><td>7</td></tr>

  <tr><td>Android 2.0.1</td><td>6</td></tr>

  <tr><td>Android 2.0</td><td>5</td></tr>

  <tr><td>Android 1.6</td><td>4</td></tr>

  <tr><td>Android 1.5</td><td>3</td></tr>

  <tr><td>Android 1.1</td><td>2</td></tr>

  <tr><td>Android 1.0</td><td>1</td></tr>

  <tr><th>Platform Version</th><th>API Level</th><th>VERSION_CODE</th><th>Notes</th></tr>

  

    <tr><td><a href="{@docRoot}sdk/android-3.2.html">Android 3.2</a></td>

    <td><a href="{@docRoot}sdk/api_diff/13/changes.html" title="Diff Report">13</a></td>

    <td>{@link android.os.Build.VERSION_CODES#HONEYCOMB_MR2}</td>

    <td><!-- <a href="{@docRoot}sdk/android-3.2-highlights.html">Platform Highlights</a>--></td></tr>

  

  <tr><td><a href="{@docRoot}sdk/android-3.1.html">Android 3.1.x</a></td>

    <td><a href="{@docRoot}sdk/api_diff/12/changes.html" title="Diff Report">12</a></td>

    <td>{@link android.os.Build.VERSION_CODES#HONEYCOMB_MR1}</td>

    <td><a href="{@docRoot}sdk/android-3.1-highlights.html">Platform Highlights</a></td></tr>

    

  <tr><td><a href="{@docRoot}sdk/android-3.0.html">Android 3.0.x</td>

    <td><a href="{@docRoot}sdk/api_diff/11/changes.html" title="Diff Report">11</a></td>

    <td>{@link android.os.Build.VERSION_CODES#HONEYCOMB}</td>

    <td><a href="{@docRoot}sdk/android-3.0-highlights.html">Platform Highlights</a></td></tr>

    

  <tr><td><a href="{@docRoot}sdk/android-2.3.3.html">Android 2.3.4<br>Android 2.3.3</td>

    <td><a href="{@docRoot}sdk/api_diff/10/changes.html" title="Diff Report">10</a></td>

    <td>{@link android.os.Build.VERSION_CODES#GINGERBREAD_MR1}</td>

    <td rowspan="2"><a href="{@docRoot}sdk/android-2.3-highlights.html">Platform Highlights</a></td></tr>

  

  <tr><td><a href="{@docRoot}sdk/android-2.3.html">Android 2.3.2<br>Android 2.3.1<br>Android 2.3</td>

    <td><a href="{@docRoot}sdk/api_diff/9/changes.html" title="Diff Report">9</a></td>

    <td>{@link android.os.Build.VERSION_CODES#GINGERBREAD}</td>

    </tr>

  

  <tr><td><a href="{@docRoot}sdk/android-2.2.html">Android 2.2.x</td>

    <td ><a href="{@docRoot}sdk/api_diff/8/changes.html" title="Diff Report">8</a></td>

    <td>{@link android.os.Build.VERSION_CODES#FROYO}</td>

    <td><a href="{@docRoot}sdk/android-2.2-highlights.html">Platform Highlights</a></td></tr>

  

  <tr><td><a href="{@docRoot}sdk/android-2.1.html">Android 2.1.x</td>

    <td><a href="{@docRoot}sdk/api_diff/7/changes.html" title="Diff Report">7</a></td>

    <td>{@link android.os.Build.VERSION_CODES#ECLAIR_MR1}</td>

    <td rowspan="3" ><a href="{@docRoot}sdk/android-2.0-highlights.html">Platform Highlights</a></td></tr>

    

  <tr><td><a href="{@docRoot}sdk/android-2.0.1.html">Android 2.0.1</td>

    <td><a href="{@docRoot}sdk/api_diff/6/changes.html" title="Diff Report">6</a></td>

    <td>{@link android.os.Build.VERSION_CODES#ECLAIR_0_1}</td>

    </tr>

    

  <tr><td><a href="{@docRoot}sdk/android-2.0.html">Android 2.0</td>

    <td><a href="{@docRoot}sdk/api_diff/5/changes.html" title="Diff Report">5</a></td>

    <td>{@link android.os.Build.VERSION_CODES#ECLAIR}</td>

    </tr>

    

  <tr><td><a href="{@docRoot}sdk/android-1.6.html">Android 1.6</td>

    <td><a href="{@docRoot}sdk/api_diff/4/changes.html" title="Diff Report">4</a></td>

    <td>{@link android.os.Build.VERSION_CODES#DONUT}</td>

    <td><a href="{@docRoot}sdk/android-1.6-highlights.html">Platform Highlights</a></td></tr>

    

  <tr><td><a href="{@docRoot}sdk/android-1.5.html">Android 1.5</td>

    <td><a href="{@docRoot}sdk/api_diff/3/changes.html" title="Diff Report">3</a></td>

    <td>{@link android.os.Build.VERSION_CODES#CUPCAKE}</td>

    <td><a href="{@docRoot}sdk/android-1.5-highlights.html">Platform Highlights</a></td></tr>

    

  <tr><td><a href="{@docRoot}sdk/android-1.1.html">Android 1.1</td>

    <td>2</td>

    <td>{@link android.os.Build.VERSION_CODES#BASE_1_1}</td><td></td></tr>

    

  <tr><td><a href="{@docRoot}sdk/android-1.0.html">Android 1.0</td>

    <td>1</td>

    <td>{@link android.os.Build.VERSION_CODES#BASE}</td>

    <td></td></tr>

</table>

docs/html/sdk/android-3.1.jd

+3 −3
Original line number Diff line number Diff line
@@ -19,14 +19,14 @@ sdk.platform.apiLevel=12 
<h2>Reference</h2>

<ol>

<li><a

href="{@docRoot}sdk/api_diff/11/changes.html">API

href="{@docRoot}sdk/api_diff/12/changes.html">API

Differences Report &raquo;</a> </li>

</ol>



<h2>See Also</h2>

<ol>

  <li><a href="{@docRoot}guide/practices/optimizing-for-3.0.html">Optimizing

Apps for Android 3.0</a></li>

Apps for Android 3.x</a></li>

</ol>



</div>
@@ -765,7 +765,7 @@ was upgraded while it was in started state (not in a stopped state).</p></li> 


</ul>



<h3 if="other">Core utilities</h3>

<h3 id="other">Core utilities</h3>



<ul>

<li>LRU cache

docs/html/sdk/android-3.2.jd

0 → 100644
+737 −0

File added.

Preview size limit exceeded, changes collapsed.

docs/html/sdk/sdk_toc.cs

+8 −0
Original line number Diff line number Diff line
@@ -75,6 +75,14 @@ class="new">new!</span></li> 
      </li>

    </ul>

    <ul>

      <li class="toggle-list">

        <div><a href="<?cs var:toroot ?>sdk/android-3.2.html">

        <span class="en">Android 3.2 Platform</span></a> <span class="new">new!</span></div>

        <ul>

          <!-- <li><a href="<?cs var:toroot ?>sdk/android-3.2-highlights.html">Platform Highlights</a></li> -->

          <li><a href="<?cs var:toroot ?>sdk/api_diff/13/changes.html">API Differences Report &raquo;</a></li>

        </ul>

      </li>

      <li class="toggle-list">

        <div><a href="<?cs var:toroot ?>sdk/android-3.1.html">

        <span class="en">Android 3.1 Platform</span></a></div>