Skip to content

Commit 9a6b424

Browse files
committed
Doc change: add MR1 API summary and updated highlights.
Change-Id: I9a9b13b9c7b8ae3011772a62735c788762b45f7f
1 parent 2e335cb commit 9a6b424

File tree

5 files changed

+533
-13
lines changed

5 files changed

+533
-13
lines changed

Android.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \
398398
-since ./frameworks/base/api/12.xml 12 \
399399
-since ./frameworks/base/api/13.xml 13 \
400400
-since ./frameworks/base/api/14.txt 14 \
401+
-since ./frameworks/base/api/15.txt 15 \
401402
-werror -hide 113 \
402403
-overview $(LOCAL_PATH)/core/java/overview.html
403404

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,14 @@ Android platform.</p>
8383

8484
<table>
8585
<tr><th>Platform Version</th><th>API Level</th><th>VERSION_CODE</th><th>Notes</th></tr>
86-
87-
<tr><td><a href="{@docRoot}sdk/android-4.0.html">Android 4.0</a></td>
86+
87+
<tr><td><a href="{@docRoot}sdk/android-4.0.3.html">Android 4.0.3</a></td>
88+
<td><a href="{@docRoot}sdk/api_diff/15/changes.html" title="Diff Report">15</a></td>
89+
<td>{@link android.os.Build.VERSION_CODES#ICE_CREAM_SANDWICH_MR1}</td>
90+
<td><a href="{@docRoot}sdk/android-4.0-highlights.html">Platform
91+
Highlights</a></td></tr>
92+
93+
<tr><td><a href="{@docRoot}sdk/android-4.0.html">Android 4.0, 4.0.1, 4.0.2</a></td>
8894
<td><a href="{@docRoot}sdk/api_diff/14/changes.html" title="Diff Report">14</a></td>
8995
<td>{@link android.os.Build.VERSION_CODES#ICE_CREAM_SANDWICH}</td>
9096
<td><a href="{@docRoot}sdk/android-4.0-highlights.html">Platform

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ profiles</strong></p>
298298
linked together and integrated for easy accessibility. At the center is a new
299299
<strong>People app</strong> that offers richer profile information, including a
300300
large profile picture, phone numbers, addresses and accounts, status updates,
301-
events, and a new button for connecting on integrated social networks. </p>
301+
events, stream items, and a new button for connecting on integrated social networks. </p>
302302

303303
<p>The user's own contact information is stored in a new <strong>"Me"
304304
profile</strong>, allowing easier sharing with apps and people. All of the
@@ -562,7 +562,7 @@ can connect to compatible devices to take advantage of new features such as
562562
instant sharing of files, photos, or other media; streaming video or audio from
563563
another device; or connecting to compatible printers or other devices.</p>
564564

565-
<p>Android 4.0 also introduces built-in support for connecting to <strong>Bluetooth Health Device Profile (HDP)</strong> devices. With support from third-party apps, users can connect to wireless medical devices and sensors in hospitals, fitness centers, homes, and elsewhere. In addition, for connecting to higher quality Bluetooth audio devices, Android 4.0 adds support for Bluetooth Hands Free Profile (HFP) 1.6.</p>
565+
<p>Android 4.0 also introduces built-in support for connecting to <strong>Bluetooth Health Device Profile (HDP)</strong> devices. With support from third-party apps, users can connect to wireless medical devices and sensors in hospitals, fitness centers, homes, and elsewhere.</p>
566566

567567

568568
<h2 id="DeveloperApis" style="clear:right">New Developer Features</h2>
@@ -633,21 +633,21 @@ development across the range of Android-powered devices.</p>
633633
<h3 id="communication-dev">Communication and sharing</h3>
634634

635635
<p>Android 4.0 extends social and sharing features to any application on the
636-
device. Applications can integrate contacts, profile data, and calendar events
637-
from any of the user’s activities or social networks.</p>
636+
device. Applications can integrate contacts, profile data, stream items,
637+
and calendar events from any of the user’s activities or social networks.</p>
638638

639639

640640
<p style="margin-top:1em;margin-bottom:.75em;"><strong>Social API</strong></p>
641641

642642
<p>A shared social provider and API provide a new unified store for contacts,
643-
profile data, status updates, and photos. Any app or social network with user
643+
profile data, stream items, and photos. Any app or social network with user
644644
permission can contribute raw contacts and make them accessible to other apps
645645
and networks. Applications with user permission can also read profile data from
646646
the provider and display it in their applications.</p>
647647

648648
<p>The social API lets applications store standard contact data as well as new
649-
types of content for any given contact, including large profile photos and
650-
recent activity feedback. Recent activity feedback is a standard way for
649+
types of content for any given contact, including large profile photos, stream
650+
items, and recent activity feedback. Recent activity feedback is a standard way for
651651
applications to “tag” a contact with common activity, such as when the user
652652
calls the contact or sends an email or SMS message. The social provider uses the
653653
recent activity feedback as a new signal in ranking, such as for name

0 commit comments

Comments
 (0)