Skip to content

Commit a3f53af

Browse files
ddoughertyAndroid (Google) Code Review
authored andcommitted
Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread
2 parents 39cf3a4 + 237a344 commit a3f53af

File tree

4 files changed

+438
-1
lines changed

4 files changed

+438
-1
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ Android platform.</p>
8383

8484
<table>
8585
<tr><th>Platform Version</th><th>API Level</th></tr>
86+
<tr><td>Android 2.3.3</td><td>10</td></tr>
8687
<tr><td>Android 2.3</td><td>9</td></tr>
8788
<tr><td>Android 2.2</td><td>8</td></tr>
8889
<tr><td>Android 2.1</td><td>7</td></tr>

docs/html/sdk/android-2.3-highlights.jd

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,12 +336,15 @@ can create new applications that offer proximity-based information and services
336336
to users, organizations, merchants, and advertisers. </p>
337337

338338
<p>Using the NFC API,
339-
applications can respond to NFC tags “discovered” as the user “touches” an
339+
applications can read and respond to NFC tags “discovered” as the user “touches” an
340340
NFC-enabled device to elements embedded in stickers, smart posters, and even
341341
other devices. When a tag of interest is collected, applications can respond to
342342
the tag, read messages from it, and then store the messages, prompting
343343
the user as needed. </p>
344344

345+
<p>Starting from Android 2.3.3, applications can also write to tags and
346+
set up peer-to-peer connections with other NFC devices.</p>
347+
345348
<p>NFC communication relies on wireless technology in the device hardware, so
346349
support for the platform's NFC features on specific devices is determined by
347350
their manufacturers.</p>

0 commit comments

Comments
 (0)