Skip to content

Commit 9b447d1

Browse files
committed
docs: catchup gingerbread to gingerbread-docs with misc changes
Change-Id: Id5d38a6d97323e082535e433ab64e89e8bd3d021
1 parent 3d0f010 commit 9b447d1

File tree

12 files changed

+78
-48
lines changed

12 files changed

+78
-48
lines changed

docs/html/guide/developing/device.jd

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,11 @@ you don't yet have a device, check with the service providers in your area to de
3838
Android-powered devices are available.</p>
3939

4040
<p>If you want a SIM-unlocked phone, then you might consider either an Android Dev Phone or the
41-
Google Nexus One. Both are SIM-unlocked so that you can use them on any GSM network using a SIM
41+
Google Nexus S. These are SIM-unlocked so that you can use them on any GSM network using a SIM
4242
card. The Android Dev Phones also feature an unlocked bootloader so you can install custom system
43-
images (great for developing and installing custom versions of the Android platform). To purchase a
44-
Nexus One, visit <a href="http://www.google.com/phone">google.com/phone</a>. To purchase an Android
43+
images (great for developing and installing custom versions of the Android platform). To find a
44+
a place you can purchase the Nexus S, visit <a
45+
href="http://www.google.com/phone/detail/nexus-s">google.com/phone</a>. To purchase an Android
4546
Dev Phone, see the <a href="http://market.android.com/publish">Android Market</a> site
4647
(requires a developer account).</p>
4748

docs/html/guide/guide_toc.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ localized titles are added in the language order specified below.
256256
</li>
257257
<li><a href="<?cs var:toroot?>guide/topics/admin/device-admin.html">
258258
<span class="en">Device Administration</span>
259-
</a> <span class="new">new!</span>
259+
</a>
260260
</li>
261261
<li class="toggle-list">
262262
<div>
@@ -403,7 +403,7 @@ localized titles are added in the language order specified below.
403403
</li>
404404
</ul>
405405
</li>
406-
<li><a href="<?cs var:toroot ?>guide/developing/tools/proguard.html">Proguard</a></li>
406+
<li><a href="<?cs var:toroot ?>guide/developing/tools/proguard.html">ProGuard</a> <span class="new">new!</span></li>
407407
<li><a href="<?cs var:toroot ?>guide/developing/tools/adb.html#sqlite">sqlite3</a></li>
408408
<li><a href="<?cs var:toroot ?>guide/developing/tools/traceview.html" >Traceview</a></li>
409409
<li><a href="<?cs var:toroot ?>guide/developing/tools/zipalign.html" >zipalign</a></li>
@@ -445,7 +445,7 @@ localized titles are added in the language order specified below.
445445
</a></li>
446446
<li><a href="<?cs var:toroot ?>guide/publishing/licensing.html">
447447
<span class="en">Licensing Your Applications</span>
448-
</a> <span class="new">new!</span></li>
448+
</a></li>
449449
<li><a href="<?cs var:toroot ?>guide/publishing/preparing.html">
450450
<span class="en">Preparing to Publish</span>
451451
<span class="de" style="display:none">Vorbereitung auf die Veröffentlichung</span>

docs/html/resources/resources_toc.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,12 @@
197197
<span class="en">List of Samples</span>
198198
</a></div>
199199
<ul>
200+
<li><a href="<?cs var:toroot ?>resources/samples/AccelerometerPlay/index.html">
201+
<span class="en">Accelerometer Play</span>
202+
</a> <span class="new">new!</span></li>
203+
<li><a href="<?cs var:toroot ?>resources/samples/AccessibilityService/index.html">
204+
<span class="en">Accessibility Service</span>
205+
</a> <span class="new">new!</span></li>
200206
<li><a href="<?cs var:toroot ?>resources/samples/ApiDemos/index.html">
201207
<span class="en">API Demos</span>
202208
</a></li>

docs/html/resources/samples/index.jd

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ href="{@docRoot}resources/samples/get.html">Getting the Samples</a>.</p>
1818
-->
1919
<dl>
2020

21+
<dt><a href="AccelerometerPlay/index.html">Accelerometer Play</a></dt>
22+
<dd>An example that demonstrates how to use accelerometer readings
23+
in an application.</dd>
24+
25+
<dt><a href="AccessibilityService/index.html">Accessibility Service</a></dt>
26+
<dd>An example that demonstrates the use of accessibility APIs.</dd>
27+
2128
<dt><a href="ApiDemos/index.html">API Demos</a></dt>
2229
<dd>A variety of small applications that demonstrate an extensive collection of
2330
framework topics.</dd>

docs/html/resources/tutorials/views/hello-mapview.jd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ protected boolean onTap(int index) {
223223
OverlayItem item = mOverlays.get(index);
224224
AlertDialog.Builder dialog = new AlertDialog.Builder(mContext);
225225
dialog.setTitle(item.getTitle());
226-
dialog.setMessage(item.getSnippet())
226+
dialog.setMessage(item.getSnippet());
227227
dialog.show();
228228
return true;
229229
}

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,18 @@ page.title=Android 2.3 Platform Highlights
4040

4141
<div class="video">
4242
<object width="278" height="180">
43-
<param name="movie" value="http://www.youtube.com/v/yAZYSVr2Bhc&hl=en&fs=1&"></param>
43+
<param name="movie" value="http://www.youtube.com/v/Jx3pdWBlZ34?hl=en&fs=1"></param>
4444
<param name="allowFullScreen" value="true"></param><param name="allowscriptaccess"
4545
value="always"></param>
46-
<embed src="http://www.youtube.com/v/yAZYSVr2Bhc&hl=en&fs=1&" type="application/x-shockwave-flash"
46+
<embed src="http://www.youtube.com/v/Jx3pdWBlZ34?hl=en&fs=1" type="application/x-shockwave-flash"
4747
allowscriptaccess="always" allowfullscreen="true" width="278" height="180"></embed>
4848
</object>
4949
</div>
5050

5151
<p>The Android 2.3 platform introduces many new and exciting features for
52-
users and developers. This document provides a glimpse at some of the new user features
52+
users and developers. This document provides a glimpse at some of the new features
5353
and technologies in Android 2.3. For detailed information about the new developer APIs, see the <a
54-
href="android-2.3.html#api">Android 2.3 version notes</a>.</p>
54+
href="android-2.3.html">Android 2.3 version notes</a>.</p>
5555

5656
<ul>
5757
<li><a href="#UserFeatures">New User Features</a></li>
@@ -251,7 +251,8 @@ application could use readings from a gyroscope and accelerometer on the device
251251
to recognize complex user gestures and motions, such as tilt, spin, thrust, and
252252
slice. </p>
253253

254-
<p style="margin-top:1.25em;margin-bottom:.75em;"><strong>Low-latency native
254+
255+
<p style="margin-top:1.25em;margin-bottom:.75em;"><strong>Open API for native
255256
audio</strong></p>
256257

257258
<p>The platform provides a software implementation of <a
@@ -405,7 +406,7 @@ open container format</li>
405406
<ul>
406407
<li>Dalvik VM:
407408
<ul>
408-
<li>Concurrent Garbage Collector (target sub-3ms pauses)</li>
409+
<li>Concurrent garbage collector (target sub-3ms pauses)</li>
409410
<li>Adds further JIT (code-generation) optimizations</li>
410411
<li>Improved code verification</li>
411412
<li>StrictMode debugging, for identifying performance and memory issues</li>
@@ -438,5 +439,5 @@ open container format</li>
438439
</ul>
439440

440441
<p>For more information about the new developer APIs, see the <a
441-
href="android-2.3.html#api">Android 2.3 version notes</a> and the <a
442+
href="android-2.3.html">Android 2.3 version notes</a> and the <a
442443
href="{@docRoot}sdk/api_diff/9/changes.html">API Differences Report</a>.</p>

docs/html/sdk/android-2.3.jd

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ gyroscope sensor. To do so, add <code>&lt;uses-feature
225225
android:name="android.hardware.sensor.gyroscope"
226226
android:required="true"&gt;</code> to the application manifest.</p>
227227

228-
<p>For API details, see {@link android.hardware.Sensor}</p>
228+
<p>For API details, see {@link android.hardware.Sensor}.</p>
229229

230230

231231
<h3 id="cameras">Multiple cameras support</h3>
@@ -242,9 +242,9 @@ positional characteristics (orientation, front-facing or back-facing).</li>
242242
android.hardware.Camera#getCameraInfo(int,CameraInfo) getCameraInfo()} methods in the {@link
243243
android.hardware.Camera} class let applications query for the cameras available
244244
and open the camera that they need.</li>
245-
<li>New {@link android.media.CamcorderProfile get(int,int) method lets
246-
applications retrieve a CamcorderProfile for a specific camera. </li>
247-
<li>New {@link android media.CameraProfile#getJpegEncodingQualityParameter(int, int)
245+
<li>New {@link android.media.CamcorderProfile#get get()} method lets
246+
applications retrieve a {@link android.media.CamcorderProfile} for a specific camera. </li>
247+
<li>New {@link android.media.CameraProfile#getJpegEncodingQualityParameter(int, int)
248248
getJpegEncodingQualityParameter()} lets applications obtain the still-image
249249
capture quality level for a specific camera.</li>
250250
</ul>
@@ -389,19 +389,19 @@ security of Views that provide access to sensitive functionality. For example,
389389
touch filtering is appropriate to ensure the security of user actions such as
390390
granting a permission request, making a purchase, or clicking on an
391391
advertisement. For details, see the <a
392-
href="{@docRoot}reference/android/view/View.html#security">View class
392+
href="{@docRoot}reference/android/view/View.html#Security">View class
393393
documentation</a>.</li>
394394
<li>New <code>filterTouchesWhenObscured</code> attribute for view elements,
395395
which declares whether to filter touches when the view's window is obscured by
396396
another visible window. When set to <code>"true"</code>, the view will not
397397
receive touches whenever a toast, dialog or other window appears above the
398398
view's window. Refer to <a
399-
href="{@docRoot}reference/android/view/View.html#security">View security
399+
href="{@docRoot}reference/android/view/View.html#Security">View security
400400
documentation</a> for details.</li>
401401
</ul>
402402

403403
<p class="note">To look at sample code for touch filtering, see
404-
<a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/view/SecureView.html">SurfaceView.java</a>
404+
<a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/view/SecureView.html">SecureView.java</a>
405405
in the ApiDemos sample application.</p>
406406
</li>
407407

docs/html/sdk/eclipse-adt.jd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,9 @@ example, ADT 8.x is for SDK Tools r8.</li>
152152
"export signed/unsigned application package", ADT does <em>not</em> insert it.
153153
If you manually set <code>debuggable="true"</code> in the manifest file, then release builds will
154154
actually create a debug build (it does not remove it if you placed it there).</p></li>
155-
<li>Automatic <a href="{@docRoot}guide/developing/tools/proguard.html">Proguard</a> support in
156-
release builds. For it to work, you need to have a <code>proguard.config</code>
157-
property in the <code>default.properties</code> file that points to a proguard config file.</li>
155+
<li>Automatic <a href="{@docRoot}guide/developing/tools/proguard.html">ProGuard</a> support in
156+
release builds. For it to work, you need to have a <code>proguard.config</code>
157+
property in the <code>default.properties</code> file that points to a ProGuard config file.</li>
158158
<li>Completely rewritten Visual Layout Editor. (This is still a work in progress.) Now includes:
159159
<ul>
160160
<li>Full drag and drop from palette to layout for all Layout classes.</li>

docs/html/sdk/index.jd

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@ page.title=Android SDK
22
sdk.redirect=0
33

44
sdk.win_installer=installer_r08-windows.exe
5-
sdk.win_installer_bytes=TODO
6-
sdk.win_installer_checksum=TODO
5+
sdk.win_installer_bytes=32746192
6+
sdk.win_installer_checksum=04ce87b10a8361a1f63cf2238bbc1ee3
77

88
sdk.win_download=android-sdk_r08-windows.zip
9-
sdk.win_bytes=TODO
10-
sdk.win_checksum=TODO
9+
sdk.win_bytes=32696391
10+
sdk.win_checksum=3e0b08ade5bfa9624bce9ddc164a48cb
1111

12-
sdk.mac_download=android-sdk_r08-mac_x86.zip
13-
sdk.mac_bytes=TODO
14-
sdk.mac_checksum=TODO
12+
sdk.mac_download=android-sdk_r08-mac_86.zip
13+
sdk.mac_bytes=28797617
14+
sdk.mac_checksum=d2e392c4e4680cbf2dfd6dbf82b662c7
1515

16-
sdk.linux_download=android-sdk_r08-linux_x86.tgz
17-
sdk.linux_bytes=TODO
18-
sdk.linux_checksum=TODO
16+
sdk.linux_download=android-sdk_r08-linux_86.tgz
17+
sdk.linux_bytes=26817291
18+
sdk.linux_checksum=3b626645b223d137d27beefbda0c94bc
1919

2020
@jd:body
2121

docs/html/sdk/ndk/index.jd

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
ndk=true
22

3-
ndk.win_download=android-ndk-r4b-windows.zip
4-
ndk.win_bytes=45792835
5-
ndk.win_checksum=e397145e155a639be53ee4b6db8ad511
3+
ndk.win_download=android-ndk-r5-windows.zip
4+
ndk.win_bytes=62217450
5+
ndk.win_checksum=59cbb02d91d74e9c5c7278d94c989e80
66

7-
ndk.mac_download=android-ndk-r4b-darwin-x86.zip
8-
ndk.mac_bytes=50586041
9-
ndk.mac_checksum=41dbd54335fb828ee408eab17103a1b0
7+
ndk.mac_download=android-ndk-r5-darwin-x86.tar.bz2
8+
ndk.mac_bytes=50210863
9+
ndk.mac_checksum=9dee8e4cb529a5619e9b8d1707478c32
1010

11-
ndk.linux_download=android-ndk-r4b-linux-x86.zip
12-
ndk.linux_bytes=49464776
13-
ndk.linux_checksum=2deabcb125c219b34140975b710f00ec
11+
ndk.linux_download=android-ndk-r5-linux-x86.tar.bz2
12+
ndk.linux_bytes=44362746
13+
ndk.linux_checksum=49d5c35ec02bafc074842542c58b7eb3
1414

1515
page.title=Android NDK
1616
@jd:body
@@ -64,7 +64,7 @@ padding: .25em 1em;
6464
onclick="return toggleDiv(this)"><img src="{@docRoot}assets/images/triangle-opened.png"
6565
class="toggle-img"
6666
height="9px"
67-
width="9px" /> Android NDK, Revision 5</a> <em>(November 2010)</em>
67+
width="9px" /> Android NDK, Revision 5</a> <em>(December 2010)</em>
6868

6969
<div class="toggleme">
7070
<p>This release of the NDK includes many new APIs, most of which are introduced to

0 commit comments

Comments
 (0)