From 8edad6f16fc1d60a163e0f63153ff4f8a95e6c0e Mon Sep 17 00:00:00 2001 From: Scott Main Date: Fri, 9 Mar 2012 10:55:50 -0800 Subject: [PATCH] docs: Fix a bunch of misc doc issues from external tracker Change-Id: I03cae5bdb7b806e81cc6c983a014de212cb80c73 --- .../android/hardware/GeomagneticField.java | 2 +- docs/html/guide/developing/device.jd | 46 +++++++++---------- .../developing/tools/monkeyrunner_concepts.jd | 2 +- docs/html/guide/market/expansion-files.jd | 8 +--- .../fundamentals/tasks-and-back-stack.jd | 4 +- .../guide/topics/manifest/manifest-element.jd | 2 +- .../providers/content-provider-basics.jd | 4 +- .../topics/resources/providing-resources.jd | 5 +- .../guide/topics/resources/string-resource.jd | 11 +++-- docs/html/guide/topics/sensors/index.jd | 2 +- docs/html/guide/topics/ui/layout-objects.jd | 2 +- docs/html/guide/topics/wireless/wifip2p.jd | 6 +-- .../tutorials/views/hello-webview.jd | 2 +- docs/html/sdk/android-4.0-highlights.jd | 2 +- .../docking-monitoring.jd | 2 +- 15 files changed, 49 insertions(+), 51 deletions(-) diff --git a/core/java/android/hardware/GeomagneticField.java b/core/java/android/hardware/GeomagneticField.java index 96fbe77db087b..036982592d5c6 100644 --- a/core/java/android/hardware/GeomagneticField.java +++ b/core/java/android/hardware/GeomagneticField.java @@ -19,7 +19,7 @@ package android.hardware; import java.util.GregorianCalendar; /** - * This class is used to estimated estimate magnetic field at a given point on + * Estimates magnetic field at a given point on * Earth, and in particular, to compute the magnetic declination from true * north. * diff --git a/docs/html/guide/developing/device.jd b/docs/html/guide/developing/device.jd index d22dca1fee41b..d91551a8e92dc 100644 --- a/docs/html/guide/developing/device.jd +++ b/docs/html/guide/developing/device.jd @@ -134,11 +134,11 @@ above.

ASUS - 0B05 + 0b05 Dell - 413C + 413c Foxconn @@ -146,35 +146,35 @@ above.

Fujitsu - 04C5 + 04c5 Fujitsu Toshiba - 04C5 + 04c5 Garmin-Asus - 091E + 091e Google - 18D1 + 18d1 Hisense - 109B + 109b HTC - 0BB4 + 0bb4 Huawei - 12D1 + 12d1 K-Touch - 24E3 + 24e3 KT Tech @@ -185,8 +185,8 @@ above.

0482 - Lenevo - 17EF + Lenovo + 17ef LG @@ -194,7 +194,7 @@ above.

Motorola - 22B8 + 22b8 NEC @@ -214,11 +214,11 @@ above.

Pantech - 10A9 + 10a9 Pegatron - 1D4D + 1d4d Philips @@ -226,31 +226,31 @@ above.

PMC-Sierra - 04DA + 04da Qualcomm - 05C6 + 05c6 SK Telesys - 1F53 + 1f53 Samsung - 04E8 + 04e8 Sharp - 04DD + 04dd Sony - 054C + 054c Sony Ericsson - 0FCE + 0fce Teleepoch @@ -262,6 +262,6 @@ above.

ZTE - 19D2 + 19d2 diff --git a/docs/html/guide/developing/tools/monkeyrunner_concepts.jd b/docs/html/guide/developing/tools/monkeyrunner_concepts.jd index 499b610bf7340..346a0c648cd52 100644 --- a/docs/html/guide/developing/tools/monkeyrunner_concepts.jd +++ b/docs/html/guide/developing/tools/monkeyrunner_concepts.jd @@ -236,7 +236,7 @@ Table 1 explains the flags and arguments. You can generate an API reference for monkeyrunner by running: 

-monkeyrunner <format> help.py <outfile>
+monkeyrunner help.py <format> <outfile>

The arguments are: diff --git a/docs/html/guide/market/expansion-files.jd b/docs/html/guide/market/expansion-files.jd index 01acb33fc5910..36b8f9ca043e2 100644 --- a/docs/html/guide/market/expansion-files.jd +++ b/docs/html/guide/market/expansion-files.jd @@ -1088,12 +1088,8 @@ android.content.res.AssetFileDescriptor}, such as some {@link android.media.Medi

Most applications don't need to use this class. This class defines a {@link android.content.ContentProvider} that marshals the data from the ZIP files through a content provider {@link android.net.Uri} in order to provide file access for certain Android APIs that -expect {@link android.net.Uri} access to media files. -

The sample application available in the -Apk Expansion package demonstrates a scenario in which this class is useful -to specify a video with {@link android.widget.VideoView#setVideoURI -VideoView.setVideoURI()}. See the sample app's class {@code SampleZipfileProvider} for an -example of how to extend this class to use in your application.

+expect {@link android.net.Uri} access to media files. For example, this is useful if you want to +play a video with {@link android.widget.VideoView#setVideoURI VideoView.setVideoURI()}.

Reading from a ZIP file

diff --git a/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd b/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd index 465cf542dfb10..0880614ae6468 100644 --- a/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd +++ b/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd @@ -154,7 +154,7 @@ See the following section about Activity state.

Because the activities in the back stack are never rearranged, if your application allows users to start a particular activity from more than one activity, a new instance of -that activity is created and popped onto the stack (rather than bringing any previous instance of +that activity is created and pushed onto the stack (rather than bringing any previous instance of the activity to the top). As such, one activity in your application might be instantiated multiple times (even from different tasks), as shown in figure 3. As such, if the user navigates backward using the Back button, each instance of the activity is revealed in the order they were @@ -291,7 +291,7 @@ B should associate with current task. If both activities define how Activity B should associate with a task, then Activity A's request (as defined in the intent) is honored over Activity B's request (as defined in its manifest).

-

Note: Some the launch modes available in the manifest +

Note: Some launch modes available for the manifest file are not available as flags for an intent and, likewise, some launch modes available as flags for an intent cannot be defined in the manifest.

diff --git a/docs/html/guide/topics/manifest/manifest-element.jd b/docs/html/guide/topics/manifest/manifest-element.jd index 9788945fbed5a..98968d739f12b 100644 --- a/docs/html/guide/topics/manifest/manifest-element.jd +++ b/docs/html/guide/topics/manifest/manifest-element.jd @@ -37,7 +37,7 @@ parent.link=manifest-intro.html
description:
The root element of the AndroidManifest.xml file. It must contain an <application> element -and specify {@code xlmns:android} and {@code package} attributes.
+and specify {@code xmlns:android} and {@code package} attributes.
attributes:
diff --git a/docs/html/guide/topics/providers/content-provider-basics.jd b/docs/html/guide/topics/providers/content-provider-basics.jd index 40b5c3fd4c7be..de89568c4fc61 100644 --- a/docs/html/guide/topics/providers/content-provider-basics.jd +++ b/docs/html/guide/topics/providers/content-provider-basics.jd @@ -123,7 +123,7 @@ page.title=Content Provider Basics

- A content provider manages access to a central repository of data. The provider and + A content provider manages access to a central repository of data. A provider is part of an Android application, which often provides its own UI for working with the data. However, content providers are primarily intended to be used by other applications, which access the provider using a provider client object. Together, providers @@ -569,7 +569,7 @@ selectionArgs[0] = mUserInput;

A selection clause that uses ? as a replaceable parameter and an array of - selection arguments array are preferred way to specify a selection, even the provider isn't + selection arguments array are preferred way to specify a selection, even if the provider isn't based on an SQL database.

diff --git a/docs/html/guide/topics/resources/providing-resources.jd b/docs/html/guide/topics/resources/providing-resources.jd index 380791a089993..b33a097790f18 100644 --- a/docs/html/guide/topics/resources/providing-resources.jd +++ b/docs/html/guide/topics/resources/providing-resources.jd @@ -287,9 +287,8 @@ names.

from the SIM card in the device. For example, mcc310 is U.S. on any carrier, mcc310-mnc004 is U.S. on Verizon, and mcc208-mnc00 is France on Orange.

-

If the device uses a radio connection (GSM phone), the MCC comes - from the SIM, and the MNC comes from the network to which the - device is connected.

+

If the device uses a radio connection (GSM phone), the MCC and MNC values come + from the SIM card.

You can also use the MCC alone (for example, to include country-specific legal resources in your application). If you need to specify based on the language only, then use the language and region qualifier instead (discussed next). If you decide to use the MCC and diff --git a/docs/html/guide/topics/resources/string-resource.jd b/docs/html/guide/topics/resources/string-resource.jd index ecd2d48a958b8..5f5484ee42bb7 100644 --- a/docs/html/guide/topics/resources/string-resource.jd +++ b/docs/html/guide/topics/resources/string-resource.jd @@ -358,11 +358,14 @@ values, with non-exhaustive examples in parentheses: 

 int count = getNumberOfsongsAvailable();
 Resources res = {@link android.content.Context#getResources()};
-String songsFound = res.{@link android.content.res.Resources#getQuantityString(int,int)
-getQuantityString}(R.plurals.numberOfSongsAvailable, count, count);
+String songsFound = res.getQuantityString(R.plurals.numberOfSongsAvailable, count, count);
-

When using the {@link android.content.res.Resources#getQuantityString(int,int) -getQuantityString()} method, you need to pass the {@code count} twice if your string includes + +

When using the {@code +getQuantityString()} method, you need to pass the {@code count} twice if your string includes string formatting with a number. For example, for the string {@code %d songs found}, the first {@code count} parameter selects the appropriate plural string and the second {@code count} parameter is inserted into the {@code %d} placeholder. If your plural diff --git a/docs/html/guide/topics/sensors/index.jd b/docs/html/guide/topics/sensors/index.jd index 75a1716c1931f..43903dcf735ae 100644 --- a/docs/html/guide/topics/sensors/index.jd +++ b/docs/html/guide/topics/sensors/index.jd @@ -43,7 +43,7 @@ device's temperature sensor and humidity sensor to calculate and report the dewp application might use the geomagnetic field sensor and accelerometer to report a compass bearing.

-

The Android platform supports four broad categories of sensors:

+

The Android platform supports three broad categories of sensors: