diff options
Diffstat (limited to 'docs/html')
-rw-r--r-- | docs/html/guide/topics/manifest/uses-sdk-element.jd | 22 | ||||
-rw-r--r-- | docs/html/tools/revisions/platforms.jd | 54 |
2 files changed, 53 insertions, 23 deletions
diff --git a/docs/html/guide/topics/manifest/uses-sdk-element.jd b/docs/html/guide/topics/manifest/uses-sdk-element.jd index 9169658..8de4739 100644 --- a/docs/html/guide/topics/manifest/uses-sdk-element.jd +++ b/docs/html/guide/topics/manifest/uses-sdk-element.jd @@ -273,55 +273,55 @@ Highlights</a>--></td></tr> <td>{@link android.os.Build.VERSION_CODES#HONEYCOMB_MR1}</td> <td><a href="{@docRoot}about/versions/android-3.1-highlights.html">Platform Highlights</a></td></tr> - <tr><td><a href="{@docRoot}about/versions/android-3.0.html">Android 3.0.x</td> + <tr><td><a href="{@docRoot}about/versions/android-3.0.html">Android 3.0.x</a></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}about/versions/android-3.0-highlights.html">Platform Highlights</a></td></tr> - <tr><td><a href="{@docRoot}about/versions/android-2.3.3.html">Android 2.3.4<br>Android 2.3.3</td> + <tr><td><a href="{@docRoot}about/versions/android-2.3.3.html">Android 2.3.4<br>Android 2.3.3</a></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}about/versions/android-2.3-highlights.html">Platform Highlights</a></td></tr> - <tr><td><a href="{@docRoot}about/versions/android-2.3.html">Android 2.3.2<br>Android 2.3.1<br>Android -2.3</td> + <tr><td><a href="{@docRoot}about/versions/android-2.3.html">Android 2.3.2<br>Android 2.3.1<br> + Android 2.3</a></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}about/versions/android-2.2.html">Android 2.2.x</td> + <tr><td><a href="{@docRoot}about/versions/android-2.2.html">Android 2.2.x</a></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}about/versions/android-2.2-highlights.html">Platform Highlights</a></td></tr> - <tr><td><a href="{@docRoot}about/versions/android-2.1.html">Android 2.1.x</td> + <tr><td><a href="{@docRoot}about/versions/android-2.1.html">Android 2.1.x</a></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}about/versions/android-2.0-highlights.html">Platform Highlights</a></td></tr> - <tr><td><a href="{@docRoot}about/versions/android-2.0.1.html">Android 2.0.1</td> + <tr><td><a href="{@docRoot}about/versions/android-2.0.1.html">Android 2.0.1</a></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}about/versions/android-2.0.html">Android 2.0</td> + <tr><td><a href="{@docRoot}about/versions/android-2.0.html">Android 2.0</a></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}about/versions/android-1.6.html">Android 1.6</td> + <tr><td><a href="{@docRoot}about/versions/android-1.6.html">Android 1.6</a></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}about/versions/android-1.6-highlights.html">Platform Highlights</a></td></tr> - <tr><td><a href="{@docRoot}about/versions/android-1.5.html">Android 1.5</td> + <tr><td><a href="{@docRoot}about/versions/android-1.5.html">Android 1.5</a></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}about/versions/android-1.5-highlights.html">Platform Highlights</a></td></tr> - <tr><td><a href="{@docRoot}about/versions/android-1.1.html">Android 1.1</td> + <tr><td><a href="{@docRoot}about/versions/android-1.1.html">Android 1.1</a></td> <td>2</td> <td>{@link android.os.Build.VERSION_CODES#BASE_1_1}</td><td></td></tr> diff --git a/docs/html/tools/revisions/platforms.jd b/docs/html/tools/revisions/platforms.jd index f219784..c5d1ef6 100644 --- a/docs/html/tools/revisions/platforms.jd +++ b/docs/html/tools/revisions/platforms.jd @@ -7,14 +7,12 @@ page.title=Platforms <h2>See Also</h2> <ol> + <li><a href="{@docRoot}about/versions/kitkat.html">KitKat +Highlights and APIs</a></li> <li><a href="{@docRoot}about/versions/jelly-bean.html">Jelly Bean Highlights and APIs</a></li> <li><a href="{@docRoot}about/versions/android-4.0-highlights.html">Ice Cream Sandwich Highlights and APIs</a></li> - <li><a href="{@docRoot}about/versions/android-3.0-highlights.html">Honeycomb -Highlights and APIs</a></li> - <li><a href="{@docRoot}about/versions/android-2.3-highlights.html">Gingerbread -Highlights and APIs</a></li> </ol> </div> @@ -52,11 +50,27 @@ components will not be available for download.</p> <h2 id="4.4">Android 4.4</h2> - <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="" />Revision 2</a> <em>(December 2013)</em> + </p> + + <div class="toggle-content-toggleme"> + + <p>Maintenance release. The system version is 4.4.2.</p> + <dl> + <dt>Dependencies:</dt> + <dd>Android SDK Platform-tools r19 or higher is required.</dd> + <dd>Android SDK Tools 22.3 or higher is recommended.</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="" />Revision 1</a> <em>(October 2013)</em> </p> @@ -72,19 +86,35 @@ class="toggle-content-img" alt="" />Revision 1</a> <em>(October 2013)</em> </div> </div> + <h3 id="gsi-4.4">Google APIs System Image</h3> <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="" />Revision 2</a> <em>(December 2013)</em> + </p> + + <div class="toggle-content-toggleme"> + + <p>Maintenance release. This release includes + <a href="{@docRoot}google/play-services/index.html">Google Play services</a> version 4.0.33, + allowing you to test your application in an emulator using the latest Google Play services.</p> + + </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="" />Revision 1</a> <em>(October 2013)</em> </p> <div class="toggle-content-toggleme"> <p>Initial release. This release includes - <a href="{@docRoot}google/play-services/index.html">Google Play services</a> version 4.0.30, - allowing you to test your application in an emulator using the latest Google Play services.</p> + <a href="{@docRoot}google/play-services/index.html">Google Play services</a> version 4.0.30. + </p> </div> </div> @@ -143,8 +173,8 @@ class="toggle-content-img" alt="" />Revision 3</a> <em>(September 2013)</em> <div class="toggle-content-toggleme"> <p>Maintenance update. This release includes - <a href="{@docRoot}google/play-services/index.html">Google Play services</a> version 3.2.65, - allowing you to test your application in an emulator using the latest Google Play services.</p> + <a href="{@docRoot}google/play-services/index.html">Google Play services</a> version 3.2.65. + </p> </div> </div> @@ -158,8 +188,8 @@ class="toggle-content-img" alt="" />Revision 2</a> <em>(August 2013)</em> <div class="toggle-content-toggleme"> <p>Maintenance update. This release includes - <a href="{@docRoot}google/play-services/index.html">Google Play services</a> version 3.2.25, - allowing you to test your application in an emulator using the latest Google Play services.</p> + <a href="{@docRoot}google/play-services/index.html">Google Play services</a> version 3.2.25. + </p> </div> </div> |