Skip to content

Commit 4365a48

Browse files
ddoughertyAndroid Git Automerger
authored andcommitted
am 8b6ed2d: Doc change: edits to ICS MR1 API Overview.
* commit '8b6ed2d17d5e7e47944026679c9cba66611ab27f': Doc change: edits to ICS MR1 API Overview.
2 parents 9b06f09 + 8b6ed2d commit 4365a48

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,13 @@ Android platform.</p>
8787
<tr><td><a href="{@docRoot}sdk/android-4.0.3.html">Android 4.0.3</a></td>
8888
<td><a href="{@docRoot}sdk/api_diff/15/changes.html" title="Diff Report">15</a></td>
8989
<td>{@link android.os.Build.VERSION_CODES#ICE_CREAM_SANDWICH_MR1}</td>
90-
<td><a href="{@docRoot}sdk/android-4.0-highlights.html">Platform
90+
<td rowspan="2"><a href="{@docRoot}sdk/android-4.0-highlights.html">Platform
9191
Highlights</a></td></tr>
9292

9393
<tr><td><a href="{@docRoot}sdk/android-4.0.html">Android 4.0, 4.0.1, 4.0.2</a></td>
9494
<td><a href="{@docRoot}sdk/api_diff/14/changes.html" title="Diff Report">14</a></td>
9595
<td>{@link android.os.Build.VERSION_CODES#ICE_CREAM_SANDWICH}</td>
96-
<td><a href="{@docRoot}sdk/android-4.0-highlights.html">Platform
97-
Highlights</a></td></tr>
96+
</tr>
9897

9998
<tr><td><a href="{@docRoot}sdk/android-3.2.html">Android 3.2</a></td>
10099
<td><a href="{@docRoot}sdk/api_diff/13/changes.html" title="Diff Report">13</a></td>

docs/html/sdk/android-4.0.3.jd

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ sdk.platform.apiLevel=15
2020
<h2>Reference</h2>
2121
<ol>
2222
<li><a
23-
href="{@docRoot}sdk/api_diff/14/changes.html">API
23+
href="{@docRoot}sdk/api_diff/15/changes.html">API
2424
Differences Report &raquo;</a> </li>
2525
</ol>
2626

@@ -72,9 +72,9 @@ class="toggle-content-img" alt="" />
7272
<dl>
7373
<dt>Initial release. SDK Tools r14 or higher is required.
7474
<p class="caution"><strong>Important:</strong> To download the new Android
75-
4.x system components from the Android SDK Manager, you must first update the
75+
4.0.x system components from the Android SDK Manager, you must first update the
7676
SDK tools to revision 14 or later and restart the Android SDK Manager. If you do not,
77-
the Android 4.0 system components will not be available for download.</p>
77+
the Android 4.0.x system components will not be available for download.</p>
7878
</dt>
7979
</dl>
8080

@@ -224,7 +224,7 @@ for visible fragments have run. The visibility hint is "true" by default.</li>
224224

225225
<ul>
226226
<li>New method {@link android.graphics.SurfaceTexture#setDefaultBufferSize(int
227-
width, int height)} in SurfaceTexture sets the default size of the image
227+
width, int height)} in {@link android.graphics.SurfaceTexture} sets the default size of the image
228228
buffers. This method may be used to set the image size when producing images
229229
with {@link android.graphics.Canvas} (via {@link
230230
android.view.Surface#lockCanvas}), or OpenGL ES (via an EGLSurface).</li>
@@ -308,7 +308,7 @@ profiles. Quality level is represented by the
308308
{@link android.media.CamcorderProfile#QUALITY_TIME_LAPSE_QVGA} constants.</li>
309309

310310
<li>New methods {@link android.hardware.Camera.Parameters#setVideoStabilization(boolean) setVideoStabilization()},
311-
{@link android.hardware.Camera.Parameters#getVideoStabilization() setVideoStabilization()}, and {android.hardware.Camera.Parameters#isVideoStabilizationSupported() isVideoStabilizationSupported()}
311+
{@link android.hardware.Camera.Parameters#getVideoStabilization() setVideoStabilization()}, and {@link android.hardware.Camera.Parameters#isVideoStabilizationSupported() isVideoStabilizationSupported()}
312312
let you check and manage video stabilization for a {@link android.hardware.Camera}.</li>
313313
</ul>
314314

0 commit comments

Comments
 (0)