Skip to content

Commit 52bfc24

Browse files
committed
docs: fix misc doc bugs from external issue tracker
Change-Id: If6ff3476670e42b321d56d4a1482ccff96d4d500
1 parent 09ff04d commit 52bfc24

File tree

14 files changed

+40
-43
lines changed

14 files changed

+40
-43
lines changed

core/java/android/hardware/SensorEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ public class SensorEvent {
294294
* <li>X is defined as the vector product <b>Y.Z</b> (It is tangential to
295295
* the ground at the device's current location and roughly points East).</li>
296296
* <li>Y is tangential to the ground at the device's current location and
297-
* points towards the magnetic North Pole.</li>
297+
* points towards magnetic north.</li>
298298
* <li>Z points towards the sky and is perpendicular to the ground.</li>
299299
* </ul>
300300
*

core/java/android/provider/Settings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1386,7 +1386,7 @@ public static void setShowGTalkServiceStatus(ContentResolver cr, boolean flag) {
13861386
public static final int SCREEN_BRIGHTNESS_MODE_MANUAL = 0;
13871387

13881388
/**
1389-
* SCREEN_BRIGHTNESS_MODE value for manual mode.
1389+
* SCREEN_BRIGHTNESS_MODE value for automatic mode.
13901390
*/
13911391
public static final int SCREEN_BRIGHTNESS_MODE_AUTOMATIC = 1;
13921392

docs/html/guide/developing/devices/managing-avds.jd

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -233,13 +233,5 @@ to emulate:</p>
233233

234234
<td>hw.lcd.density</td>
235235
</tr>
236-
237-
<tr>
238-
<td>Trackball support</td>
239-
240-
<td>Whether there is a trackball present.</td>
241-
242-
<td>hw.trackBall</td>
243-
</tr>
244236
</table>
245237

docs/html/guide/developing/projects/index.jd

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,9 @@ page.title=Managing Projects
179179

180180
<dd>Customizable computer-specific properties for the build system. If you use Ant to build
181181
the project, this contains the path to the SDK installation. Because the content of the file
182-
is specific to the local installation of the SDK, maintained it in a source
183-
revision control system. If you use Eclipse, this file is not used.</dd>
182+
is specific to the local installation of the SDK, the <code>local.properties</code> should not
183+
be maintained in a source revision control system. If you use Eclipse, this file is not
184+
used.</dd>
184185

185186
<dt><code>ant.properties</code></dt>
186187

docs/html/guide/topics/fundamentals.jd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ performing transactions with the provider doesn't need to and instead calls meth
243243
android.content.ContentResolver} object. This leaves a layer of abstraction between the content
244244
provider and the component requesting information (for security).</p>
245245

246-
<p>There are separate methods for activiting each type of component:</p>
246+
<p>There are separate methods for activating each type of component:</p>
247247
<ul>
248248
<li>You can start an activity (or give it something new to do) by
249249
passing an {@link android.content.Intent} to {@link android.content.Context#startActivity
@@ -400,7 +400,7 @@ href="{@docRoot}guide/appendix/api-levels.html">API Level</a> 7), you should dec
400400
requirements in your manifest file. That way, devices that do <em>not</em> have a camera and have an
401401
Android version <em>lower</em> than 2.1 cannot install your application from Android Market.</p>
402402

403-
<p>However, you can also declare that your applicaiton uses the camera, but does not
403+
<p>However, you can also declare that your application uses the camera, but does not
404404
<em>require</em> it. In that case, your application must perform a check at runtime to determine
405405
if the device has a camera and disable any features that use the camera if one is not available.</p>
406406

docs/html/guide/topics/fundamentals/loaders.jd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/Load
491491
LoaderCursor</a> &#8212; A complete version of the
492492
snippet shown above.</li>
493493
<li><a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LoaderThrottle.html"> LoaderThrottle</a> &#8212; An example of how to use throttling to
494-
reduce the number of queries a content provider does then its data changes.</li>
494+
reduce the number of queries a content provider does when its data changes.</li>
495495
</ul>
496496

497497
<p>For information on downloading and installing the SDK samples, see <a

docs/html/guide/topics/manifest/activity-element.jd

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,10 +272,11 @@ is "{@code false}", it cannot be instantiated.
272272
</p></dd>
273273

274274
<dt><a name="exclude"></a>{@code android:excludeFromRecents}</dt>
275-
<dd>Whether or not the activity should be excluded from the list of recently
276-
launched activities that can be displayed to users &mdash; "{@code true}" if
277-
it should be excluded, and "{@code false}" if it should be included.
278-
The default value is "{@code false}".
275+
<dd>Whether or not the task initiated by this activity should be excluded from the list of recently
276+
used applications ("recent apps"). That is, when this activity is the root activity of a new task,
277+
this attribute determines whether the task should not appear in the list of recent apps. "{@code
278+
true}" if the task should be <em>excluded</em> from the list; "{@code false}" if it should be
279+
<em>included</em>. The default value is "{@code false}".
279280
</p></dd>
280281

281282
<dt><a name="exported"></a>{@code android:exported}</dt>

docs/html/guide/topics/resources/drawable-resource.jd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1248,7 +1248,6 @@ the right edge, a right gravity clips the left edge, and neither clips both edge
12481248
android:drawable="@drawable/android"
12491249
android:clipOrientation="horizontal"
12501250
android:gravity="left" /&gt;
1251-
&lt;/clip>
12521251
</pre>
12531252
<p>The following layout XML applies the clip drawable to a View:</p>
12541253
<pre>

docs/html/guide/topics/resources/more-resources.jd

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -216,27 +216,29 @@ is specified with a number followed by a unit of measure.
216216
For example: 10px, 2in, 5sp. The following units of measure are supported by Android:</p>
217217
<dl>
218218
<dt>{@code dp}</dt>
219-
<dd>Density-independent Pixels - an abstract unit that is based on the physical density of the
220-
screen. These units are relative to a 160 dpi (dots per inch) screen, so <em>{@code 160dp} is
221-
always one inch</em> regardless of the screen density. The ratio of dp-to-pixel will change with the
222-
screen density, but not necessarily in direct proportion. You should use these units when specifying
223-
view dimensions in your layout, so the UI properly scales to render at the same actual size on
224-
different screens. (The compiler accepts both "dip" and "dp", though "dp" is more consistent with
225-
"sp".)</dd>
219+
<dd>Density-independent Pixels - An abstract unit that is based on the physical density of the
220+
screen. These units are relative to a 160 dpi (dots per inch) screen, on which 1dp is roughly equal
221+
to 1px. When running on a higher density screen, the number of pixels used to draw 1dp is scaled up
222+
by a factor appropriate for the screen's dpi. Likewise, when on a lower density screen, the number
223+
of pixels used for 1dp is scaled down. The ratio of dp-to-pixel will change with the screen density,
224+
but not necessarily in direct proportion. Using dp units (instead of px units) is a simple solution
225+
to making the view dimensions in your layout resize properly for different screen densities. In
226+
other words, it provides consistency for the real-world sizes of your UI elements across different
227+
devices.</dd>
226228
<dt>{@code sp}</dt>
227-
<dd>Scale-independent Pixels - this is like the dp unit, but it is also scaled by the user's font
229+
<dd>Scale-independent Pixels - This is like the dp unit, but it is also scaled by the user's font
228230
size preference. It is recommend you use this unit when specifying font sizes, so they will be adjusted
229231
for both the screen density and the user's preference.</dd>
230232
<dt>{@code pt}</dt>
231233
<dd>Points - 1/72 of an inch based on the physical size of the screen.</dd>
232234
<dt>{@code px}</dt>
233-
<dd>Pixels - corresponds to actual pixels on the screen. This unit of measure is not recommended because
235+
<dd>Pixels - Corresponds to actual pixels on the screen. This unit of measure is not recommended because
234236
the actual representation can vary across devices; each devices may have a different number of pixels
235237
per inch and may have more or fewer total pixels available on the screen.</dd>
236238
<dt>{@code mm}</dt>
237-
<dd>Millimeters - based on the physical size of the screen.</dd>
239+
<dd>Millimeters - Based on the physical size of the screen.</dd>
238240
<dt>{@code in}</dt>
239-
<dd>Inches - based on the physical size of the screen.</dd>
241+
<dd>Inches - Based on the physical size of the screen.</dd>
240242
</dl>
241243

242244
<p class="note"><strong>Note:</strong> A dimension is a simple resource that is referenced

docs/html/resources/articles/faster-screen-orientation-change.jd

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ though.</p>
5858

5959
<p>When your application displays a lot of data, or data that is expensive to fetch,
6060
the automatic destruction/creation of the activities can be lead to a
61-
painful user experience. Take the example of <a href="http://code.google.com/p/apps-for-android/source/browse/trunk/Photostream/">Photostream</a>,
61+
painful user experience. Take the example of <a href="http://code.google.com/p/apps-for-android/source/browse/#git%2FPhotostream%2Fsrc%2Fcom%2Fgoogle%2Fandroid%2Fphotostream">Photostream</a>,
6262
a simple Flickr browsing application. After you launch the application and choose a Flickr account, the
6363
application downloads a set of 6 photos (on a T-Mobile G1) from the
6464
Flickr servers and displays them on screen. To improve the user
@@ -80,9 +80,9 @@ offers a great API exactly for that purpose.</p>
8080

8181
<p>The Activity class has a special method called
8282
{@link android.app.Activity#onRetainNonConfigurationInstance()}. This method
83-
can be used to pass an arbitrary object <em>your future self</em> and Android
83+
can be used to pass an arbitrary object to <em>your future self</em> and Android
8484
is smart enough to call this method only when needed. In the case of Photostream,
85-
the application <a href="http://code.google.com/p/apps-for-android/source/browse/trunk/Photostream/src/com/google/android/photostream/PhotostreamActivity.java#226">used this method</a>
85+
the application used this method
8686
to pass the downloaded images to the future activity on orientation change.
8787
The implementation can be summarized like so:</p>
8888

@@ -96,7 +96,7 @@ public Object onRetainNonConfigurationInstance() {
9696

9797
<p>In the new activity, in <code>onCreate()</code>, all you have to do to
9898
get your object back is to call {@link android.app.Activity#getLastNonConfigurationInstance()}.
99-
In Photostream, <a href="http://code.google.com/p/apps-for-android/source/browse/trunk/Photostream/src/com/google/android/photostream/PhotostreamActivity.java#251">this method is invoked</a>
99+
In Photostream, this method is invoked
100100
and if the returned value is not null, the grid is loaded with the list of
101101
photos from the previous activity:</p>
102102

@@ -128,3 +128,6 @@ only, not the drawables. Finally, remember that
128128
<code>onRetainNonConfigurationChange()</code> should be used only to retain
129129
data that is expensive to load. Otherwise, keep it simple and let Android
130130
do everything.</p>
131+
132+
<p>Also read the guide to <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Handling Runtime
133+
Changes</a>.</p>

0 commit comments

Comments
 (0)