Skip to content

Commit 65bd44f

Browse files
scottamainAndroid (Google) Code Review
authored andcommitted
Merge "docs: add jb mr1 api overview" into jb-mr1-dev
2 parents c17faf8 + 5765525 commit 65bd44f

File tree

15 files changed

+580
-57
lines changed

15 files changed

+580
-57
lines changed

docs/html/about/about_toc.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<div class="nav-section-header"><a href="<?cs var:toroot ?>about/versions/jelly-bean.html">
1111
<span class="en">Jelly Bean</span></a></div>
1212
<ul>
13+
<li><a href="<?cs var:toroot ?>about/versions/android-4.2.html">Android 4.2 APIs</a></li>
1314
<li><a href="<?cs var:toroot ?>about/versions/android-4.1.html">Android 4.1 APIs</a></li>
1415
</ul>
1516
</li>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ Differences Report &raquo;</a> </li>
2727
<p>
2828
<em>API Level:</em>&nbsp;<strong>{@sdkPlatformApiLevel}</strong></p>
2929

30-
<p>Android 2.3.3 is a small feature release that adds several improvements
30+
<p>Android 2.3.3 ({@link android.os.Build.VERSION_CODES#GINGERBREAD_MR1})
31+
is a small feature release that adds several improvements
3132
and APIs to the Android 2.3 platform.</p>
3233

3334
<p>For developers, the Android {@sdkPlatformVersion} platform is available as a

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ Differences Report &raquo;</a> </li>
2828
<p>
2929
<em>API Level:</em>&nbsp;<strong>{@sdkPlatformApiLevel}</strong></p>
3030

31-
<p>Android 2.3.4 is a maintenance release that adds several bug fixes and patches
31+
<p>Android 2.3.4 ({@link android.os.Build.VERSION_CODES#GINGERBREAD_MR1})
32+
is a maintenance release that adds several bug fixes and patches
3233
to the Android 2.3 platform, without any API changes from Android 2.3.3. Additionally,
3334
Android 2.3.4 brings support for the Open Accessory API to mobile devices,
3435
through the optional <a href="#usb">Open Accessory Library</a>. </p>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ Differences Report &raquo;</a> </li>
2727
<p>
2828
<em>API Level:</em>&nbsp;<strong>{@sdkPlatformApiLevel}</strong></p>
2929

30-
<p>For developers, the Android {@sdkPlatformVersion} platform is available as a
30+
<p>For developers, the Android {@sdkPlatformVersion}
31+
({@link android.os.Build.VERSION_CODES#GINGERBREAD})platform is available as a
3132
downloadable component for the Android SDK. The downloadable platform includes
3233
an Android library and system image, as well as a set of emulator skins and
3334
more. To get started developing or testing against Android {@sdkPlatformVersion},

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ Differences Report &raquo;</a> </li>
2525

2626
<p><em>API Level:</em>&nbsp;<strong>{@sdkPlatformApiLevel}</strong></p>
2727

28-
<p>For developers, the Android {@sdkPlatformVersion} platform is available as a downloadable
28+
<p>For developers, the Android {@sdkPlatformVersion} platform
29+
({@link android.os.Build.VERSION_CODES#HONEYCOMB}) is available as a downloadable
2930
component for the Android SDK. The downloadable platform includes an Android library and system
3031
image, as well as a set of emulator skins and more. The downloadable platform includes no external
3132
libraries.</p>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ Differences Report &raquo;</a> </li>
2525

2626
<p><em>API Level:</em>&nbsp;<strong>{@sdkPlatformApiLevel}</strong></p>
2727

28-
<p>For developers, the Android {@sdkPlatformVersion} platform is available as a
28+
<p>For developers, the Android {@sdkPlatformVersion} platform
29+
({@link android.os.Build.VERSION_CODES#HONEYCOMB_MR1}) is available as a
2930
downloadable component for the Android SDK. The downloadable platform includes
3031
an Android library and system image, as well as a set of emulator skins and
3132
more. The downloadable platform includes no external libraries.</p>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Differences Report &raquo;</a> </li>
2626

2727
<p><em>API Level:</em>&nbsp;<strong>{@sdkPlatformApiLevel}</strong></p>
2828

29-
<p>Android 3.2 is an incremental platform release that adds new
29+
<p>Android 3.2 ({@link android.os.Build.VERSION_CODES#HONEYCOMB_MR2}) is an incremental platform release that adds new
3030
capabilities for users and developers. The sections below provide an overview
3131
of the new features and developer APIs.</p>
3232

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ Differences Report &raquo;</a> </li>
2525

2626
<p><em>API Level:</em>&nbsp;<strong>{@sdkPlatformApiLevel}</strong></p>
2727

28-
<p>Android {@sdkPlatformVersion} is an incremental release of the Android 4.x
28+
<p>Android {@sdkPlatformVersion} ({@link android.os.Build.VERSION_CODES#ICE_CREAM_SANDWICH_MR1})
29+
is an incremental release of the Android 4.x
2930
(Ice Cream Sandwich) platform family. This release includes new features for
3031
users and developers, API changes, and various bug fixes.</p>
3132

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ Differences Report &raquo;</a> </li>
2626

2727
<p><em>API Level:</em>&nbsp;<strong>{@sdkPlatformApiLevel}</strong></p>
2828

29-
<p>Android 4.0 is a major platform release that adds a variety of new features for users and app
29+
<p>Android 4.0 ({@link android.os.Build.VERSION_CODES#ICE_CREAM_SANDWICH})
30+
is a major platform release that adds a variety of new features for users and app
3031
developers. Besides all the new features and APIs discussed below, Android 4.0 is an important
3132
platform release because it brings the extensive set of APIs and Holographic themes from Android 3.x
3233
to smaller screens. As an app developer, you now have a single platform and unified API framework

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ Differences Report &raquo;</a> </li>
3535

3636
<p>API Level: 16</p>
3737

38-
<p>Android 4.1 (Jelly Bean) is a progression of the platform that offers improved
38+
<p>Android 4.1 ({@link android.os.Build.VERSION_CODES#JELLY_BEAN})
39+
is a progression of the platform that offers improved
3940
performance and enhanced user experience. It adds new features for users and app
4041
developers. This document provides an introduction to the most notable and
4142
useful new APIs for app developers.</p>
@@ -70,11 +71,12 @@ Level?</a></p>
7071
</div>
7172

7273

73-
<p>As an app developer, Android 4.1 is available to you with an SDK platform you can use to build
74-
your app against Android 4.1 and with a system image you can run in the Android emulator. You
75-
should download download the platform and system image as soon as possible to build and test your
76-
app on Android 4.1. To get started developing and testing against Android
77-
4.1, use the Android SDK Manager to download the platform into your SDK.</p>
74+
75+
<p>As an app developer, Android 4.1 is available to you from the
76+
<a href="{@docRoot}tools/help/sdk-manager.html">SDK Manager</a> as a system image you can
77+
run in the Android emulator and an SDK platform against which you can build your app. You should
78+
download the system image and platform as soon as possible to build and test your
79+
app on Android 4.1.</p>
7880

7981

8082

0 commit comments

Comments
 (0)