Merge "Updated "Designing for Security" documentation" into ics-mr1
diff --git a/docs/html/guide/appendix/api-levels.jd b/docs/html/guide/appendix/api-levels.jd
index 6ace709..7d119ca 100644
--- a/docs/html/guide/appendix/api-levels.jd
+++ b/docs/html/guide/appendix/api-levels.jd
@@ -87,14 +87,13 @@
<tr><td><a href="{@docRoot}sdk/android-4.0.3.html">Android 4.0.3</a></td>
<td><a href="{@docRoot}sdk/api_diff/15/changes.html" title="Diff Report">15</a></td>
<td>{@link android.os.Build.VERSION_CODES#ICE_CREAM_SANDWICH_MR1}</td>
- <td><a href="{@docRoot}sdk/android-4.0-highlights.html">Platform
+ <td rowspan="2"><a href="{@docRoot}sdk/android-4.0-highlights.html">Platform
Highlights</a></td></tr>
<tr><td><a href="{@docRoot}sdk/android-4.0.html">Android 4.0, 4.0.1, 4.0.2</a></td>
<td><a href="{@docRoot}sdk/api_diff/14/changes.html" title="Diff Report">14</a></td>
<td>{@link android.os.Build.VERSION_CODES#ICE_CREAM_SANDWICH}</td>
- <td><a href="{@docRoot}sdk/android-4.0-highlights.html">Platform
-Highlights</a></td></tr>
+ </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>
diff --git a/docs/html/sdk/android-4.0.3.jd b/docs/html/sdk/android-4.0.3.jd
index 68257cd..c17a422 100644
--- a/docs/html/sdk/android-4.0.3.jd
+++ b/docs/html/sdk/android-4.0.3.jd
@@ -20,7 +20,7 @@
<h2>Reference</h2>
<ol>
<li><a
-href="{@docRoot}sdk/api_diff/14/changes.html">API
+href="{@docRoot}sdk/api_diff/15/changes.html">API
Differences Report »</a> </li>
</ol>
@@ -72,9 +72,9 @@
<dl>
<dt>Initial release. SDK Tools r14 or higher is required.
<p class="caution"><strong>Important:</strong> To download the new Android
- 4.x system components from the Android SDK Manager, you must first update the
+ 4.0.x system components from the Android SDK Manager, you must first update the
SDK tools to revision 14 or later and restart the Android SDK Manager. If you do not,
- the Android 4.0 system components will not be available for download.</p>
+ the Android 4.0.x system components will not be available for download.</p>
</dt>
</dl>
@@ -96,8 +96,8 @@
<div class="toggle-content-toggleme" style="padding-left:2em;">
<ol class="toc" style="margin-left:-1em">
- <li><a href="#contacts">Social stream API in contacts provider</a></li>
- <li><a href="#calendar">Calendar provider</a></li>
+ <li><a href="#contacts">Social stream API in Contacts Provider</a></li>
+ <li><a href="#calendar">Calendar Provider</a></li>
<li><a href="#widgets">Home screen widgets</a></li>
<li><a href="#textservices">Spell-checking</a></li>
<li><a href="#bluetooth">Bluetooth</a></li>
@@ -116,7 +116,7 @@
-<h3 id="contacts">Social stream API in Contacts provider</h3>
+<h3 id="contacts">Social stream API in Contacts Provider</h3>
<p>Applications that use social stream data such as status updates and check-ins
can now sync that data with each of the user’s contacts, providing items in a
@@ -142,10 +142,11 @@
android:name="android.permission.READ_SOCIAL_STREAM"></code> and/or <code><uses-permission
android:name="android.permission.WRITE_SOCIAL_STREAM"></code> in their manifest files.</p>
-<h3 id="calendar">Calendar provider</h4>
+<h3 id="calendar">Calendar Provider</h4>
<ul>
<li>Adds the class {@link android.provider.CalendarContract.Colors} to represent
-a color table in the Calendar provider. The class provivdes fields for accessing
+a color table in the <a href="{@docRoot}guide/topics/providers/calendar-provider.html">Calendar
+Provider</a>. The class provides fields for accessing
colors available for a given account. Colors are referenced by
{@link android.provider.CalendarContract.ColorsColumns#COLOR_KEY COLOR_KEY}
which must be unique for a given account name/type. These values can only be
@@ -224,7 +225,7 @@
<ul>
<li>New method {@link android.graphics.SurfaceTexture#setDefaultBufferSize(int
-width, int height)} in SurfaceTexture sets the default size of the image
+width, int height)} in {@link android.graphics.SurfaceTexture} sets the default size of the image
buffers. This method may be used to set the image size when producing images
with {@link android.graphics.Canvas} (via {@link
android.view.Surface#lockCanvas}), or OpenGL ES (via an EGLSurface).</li>
@@ -265,14 +266,14 @@
getFeatures()}for querying and enabling network TTS support.
<li>Adds a new listener class, {@link
android.speech.tts.UtteranceProgressListener}, that engines can register to
-receive notification of speech-sythesis errors.</li>
+receive notification of speech-synthesis errors.</li>
</ul>
<h3 id="database">Database</h3>
<ul>
<li>A new {@link android.database.CrossProcessCursorWrapper} class lets content
-providers return results for a cross-process query more effieciently. The new
+providers return results for a cross-process query more efficiently. The new
class is a useful building block for wrapping cursors that will be sent to
processes remotely. It can also transform normal {@link android.database.Cursor}
objects into {@link android.database.CrossProcessCursor} objects
@@ -290,7 +291,7 @@
<h3 id="intents">Intents</h3>
-<p>Adds for categories for targeting common types of applications on the
+<p>Adds new categories for targeting common types of applications on the
device, such as {@link android.content.Intent#CATEGORY_APP_BROWSER}, {@link
android.content.Intent#CATEGORY_APP_CALENDAR}, {@link
android.content.Intent#CATEGORY_APP_MAPS}, and more.</li>
@@ -308,7 +309,7 @@
{@link android.media.CamcorderProfile#QUALITY_TIME_LAPSE_QVGA} constants.</li>
<li>New methods {@link android.hardware.Camera.Parameters#setVideoStabilization(boolean) setVideoStabilization()},
-{@link android.hardware.Camera.Parameters#getVideoStabilization() setVideoStabilization()}, and {android.hardware.Camera.Parameters#isVideoStabilizationSupported() isVideoStabilizationSupported()}
+{@link android.hardware.Camera.Parameters#getVideoStabilization() setVideoStabilization()}, and {@link android.hardware.Camera.Parameters#isVideoStabilizationSupported() isVideoStabilizationSupported()}
let you check and manage video stabilization for a {@link android.hardware.Camera}.</li>
</ul>
@@ -319,7 +320,7 @@
<li>{@link android.Manifest.permission#READ_SOCIAL_STREAM} and
{@link android.Manifest.permission#WRITE_SOCIAL_STREAM}: Allow a sync
adapter to read and write social stream data to a contact in the shared
-contacts provider.</li>
+Contacts Provider.</li>
</ul>