drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change Iaf5d2cc2 into eclair-sdk

Browse Source 
* changes:
  doc change: misc doc fixes.
This commit is contained in:
Android (Google) Code Review
2009-11-02 21:05:30 -05:00
parent 3534daddee 6b13bc043e
commit 671c61d66f
9 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/app/SearchManager.java
View File

@ -330,8 +330,8 @@ import java.util.List;
* you'll need to update your searchable activity (or other activities) to receive the intents
* as you've defined them.</li>
* <li>Implement a Content Provider that provides suggestions. If you already have one, and it
* has access to your suggestions data. If not, you'll have to create one.
* You'll also provide information about your Content Provider in your
* has access to your suggestions data, you can use that provider. If not, you'll have to create
* one. You'll also provide information about your Content Provider in your
* package's <a href="{@docRoot}guide/topics/manifest/manifest-intro.html">manifest</a>.</li>
* <li>Update your searchable activity's XML configuration file. There are two categories of
* information used for suggestions:
@ -1181,7 +1181,7 @@ import java.util.List;
* Bundle appData = new Bundle();
* appData.put...();
* appData.put...();
* startSearch(null, false, appData);
* startSearch(null, false, appData, false);
* return true;
* }</pre>
*

4
core/java/android/util/AttributeSet.java
View File

@ -34,13 +34,13 @@ package android.util;
* <p>This interface provides an efficient mechanism for retrieving
* data from compiled XML files, which can be retrieved for a particular
* XmlPullParser through {@link Xml#asAttributeSet
* Xml.getAttributeSet()}. Normally this will return an implementation
* Xml.asAttributeSet()}. Normally this will return an implementation
* of the interface that works on top of a generic XmlPullParser, however it
* is more useful in conjunction with compiled XML resources:
*
* <pre>
* XmlPullParser parser = resources.getXml(myResouce);
* AttributeSet attributes = Xml.getAttributeSet(parser);</pre>
* AttributeSet attributes = Xml.asAttributeSet(parser);</pre>
*
* <p>The implementation returned here, unlike using
* the implementation on top of a generic XmlPullParser,

2
core/java/android/util/DisplayMetrics.java
View File

@ -69,7 +69,7 @@ public class DisplayMetrics {
* Density Independent Pixel unit, where one DIP is one pixel on an
* approximately 160 dpi screen (for example a 240x320, 1.5"x2" screen),
* providing the baseline of the system's display. Thus on a 160dpi screen
* this density value will be 1; on a 106 dpi screen it would be .75; etc.
* this density value will be 1; on a 120 dpi screen it would be .75; etc.
*
* <p>This value does not exactly follow the real screen size (as given by
* {@link #xdpi} and {@link #ydpi}, but rather is used to scale the size of

2
docs/html/guide/appendix/api-levels.jd
View File

@ -18,7 +18,7 @@ page.title=Android API Levels
</ol>
</li>
<li><a href="#provisional">Using a Provisional API Level</a></li>
<li><a href="#filtering">Filtering the Reference Documentation by API Level</a></li>
<li><a href="#filtering">Filtering the Documentation</a></li>
</ol>
<h2>See also</h2>

2
docs/html/guide/practices/design/responsiveness.jd
View File

@ -80,7 +80,7 @@ responsive to input and thus avoid ANR dialogs caused by the 5 second input
event timeout. These same practices should be followed for any other threads
that display UI, as they are also subject to the same timeouts.</p>
<p>The specific constraint on IntentReciever execution time emphasizes what
<p>The specific constraint on IntentReceiver execution time emphasizes what
they were meant to do: small, discrete amounts of work in the background such
as saving a setting or registering a Notification. So as with other methods
called in the main thread, applications should avoid potentially long-running

44
docs/html/guide/practices/ui_guidelines/icon_design.jd
View File

@ -847,118 +847,118 @@ icons in your applications.</code>.
<tr>
<td class="image-caption-i image-list">
<img src="/images/icon_design/ic_launcher_alarmclock.png" alt="Android asset" />
<img src="{@docRoot}images/icon_design/ic_launcher_alarmclock.png" alt="Android asset" />
<div class="caption">Alarm Clock</div></td>
<td class="image-caption-i image-list">
<img src="/images/icon_design/ic_launcher_browser.png" alt="Android asset" />
<img src="{@docRoot}images/icon_design/ic_launcher_browser.png" alt="Android asset" />
<div class="caption">Browser</div></td>
<td class="image-caption-i image-list">
<img src="/images/icon_design/ic_launcher_calculator.png" alt="Android asset" />
<img src="{@docRoot}images/icon_design/ic_launcher_calculator.png" alt="Android asset" />
<div class="caption">Calculator</div></td>
<td class="image-caption-i image-list">
<img src="/images/icon_design/ic_launcher_calendar.png" alt="Android asset" />
<img src="{@docRoot}images/icon_design/ic_launcher_calendar.png" alt="Android asset" />
<div class="caption">Calendar</div></td>
<td class="image-caption-i image-list">
<img src="/images/icon_design/ic_launcher_video_camera.png" alt="Android asset" />
<img src="{@docRoot}images/icon_design/ic_launcher_video_camera.png" alt="Android asset" />
<div class="caption">Camcorder</div></td>
<td class="image-caption-i image-list">
<img src="/images/icon_design/ic_launcher_camera.png" alt="Android asset" />
<img src="{@docRoot}images/icon_design/ic_launcher_camera.png" alt="Android asset" />
<div class="caption">Camera</div></td>
<td class="image-caption-i image-list">
<img src="/images/icon_design/ic_launcher_contacts.png" alt="Android asset" />
<img src="{@docRoot}images/icon_design/ic_launcher_contacts.png" alt="Android asset" />
<div class="caption">Contacts</div></td>
</tr>
<tr>
<td class="image-caption-i image-list">
<img src="/images/icon_design/ic_launcher_phone_dialer.png" alt="Android asset" />
<img src="{@docRoot}images/icon_design/ic_launcher_phone_dialer.png" alt="Android asset" />
<div class="caption">Dialer</div></td>
<td class="image-caption-i image-list">
<img src="/images/icon_design/ic_launcher_email_generic.png" alt="Android asset" />
<img src="{@docRoot}images/icon_design/ic_launcher_email_generic.png" alt="Android asset" />
<div class="caption">Email</div></td>
<td class="image-caption-i image-list">
<img src="/images/icon_design/ic_launcher_gallery.png" alt="Android asset" />
<img src="{@docRoot}images/icon_design/ic_launcher_gallery.png" alt="Android asset" />
<div class="caption">Gallery</div></td>
<td class="image-caption-i image-list">
<img src="/images/icon_design/ic_launcher_generic_application.png" alt="Android asset" />
<img src="{@docRoot}images/icon_design/ic_launcher_generic_application.png" alt="Android asset" />
<div class="caption">Generic application</div></td>
<td class="image-caption-i image-list">
<img src="/images/icon_design/ic_launcher_email.png" alt="Android asset" />
<img src="{@docRoot}images/icon_design/ic_launcher_email.png" alt="Android asset" />
<div class="caption">Gmail</div></td>
<td class="image-caption-i image-list">
<img src="/images/icon_design/ic_launcher_google_talk.png" alt="Android asset" />
<img src="{@docRoot}images/icon_design/ic_launcher_google_talk.png" alt="Android asset" />
<div class="caption">Google Talk</div></td>
<td class="image-caption-i image-list">
<img src="/images/icon_design/ic_launcher_IM.png" alt="Android asset" />
<img src="{@docRoot}images/icon_design/ic_launcher_IM.png" alt="Android asset" />
<div class="caption">IM</div></td>
</tr>
<tr>
<td class="image-caption-i image-list">
<img src="/images/icon_design/ic_launcher_maps.png" alt="Android asset" />
<img src="{@docRoot}images/icon_design/ic_launcher_maps.png" alt="Android asset" />
<div class="caption">Maps</div></td>
<td class="image-caption-i image-list">
<img src="/images/icon_design/ic_launcher_marketplace.png" alt="Android asset" />
<img src="{@docRoot}images/icon_design/ic_launcher_marketplace.png" alt="Android asset" />
<div class="caption">Market </div></td>
<td class="image-caption-i image-list">
<img src="/images/icon_design/ic_launcher_sms_mms.png" alt="Android asset" />
<img src="{@docRoot}images/icon_design/ic_launcher_sms_mms.png" alt="Android asset" />
<div class="caption">Messaging </div></td>
<td class="image-caption-i image-list">
<img src="/images/icon_design/ic_launcher_musicplayer_2.png" alt="Android asset" />
<img src="{@docRoot}images/icon_design/ic_launcher_musicplayer_2.png" alt="Android asset" />
<div class="caption">Music</div></td>
<td class="image-caption-i image-list">
<img src="/images/icon_design/ic_launcher_settings.png" alt="Android asset" />
<img src="{@docRoot}images/icon_design/ic_launcher_settings.png" alt="Android asset" />
<div class="caption">Settings</div></td>
<td class="image-caption-i image-list">
<img src="/images/icon_design/ic_launcher_voicedial.png" alt="Android asset" />
<img src="{@docRoot}images/icon_design/ic_launcher_voicedial.png" alt="Android asset" />
<div class="caption">Voice Dialer</div></td>
<td class="image-caption-i image-list">
<img src="/images/icon_design/ic_launcher_voicesearch.png" alt="Android asset" />
<img src="{@docRoot}images/icon_design/ic_launcher_voicesearch.png" alt="Android asset" />
<div class="caption">Voice Search</div></td>
</tr>
<tr>
<td class="image-caption-i image-list">
<img src="/images/icon_design/ic_launcher_youtube.png" alt="Android asset" />
<img src="{@docRoot}images/icon_design/ic_launcher_youtube.png" alt="Android asset" />
<div class="caption">YouTube</div></td>
</tr>
</table>

2
docs/html/guide/publishing/versioning.jd
View File

@ -165,4 +165,4 @@ maximum API Level. </p>
<p>For more information, see the <a
href="{@docRoot}guide/developing/manifest/uses-sdk-element.html"><code>&lt;uses-
sdk&gt;</code></a> manifest element documentation and the <a
href="{@docRoot}guide/appendix/api-levels.htmll">API Levels</a> document.</p>
href="{@docRoot}guide/appendix/api-levels.html">API Levels</a> document.</p>

2
docs/html/sdk/1.5_r3/upgrading.jd
View File

@ -187,7 +187,7 @@ uninstall procedure and continue to <a href="#installAdt">Install the 0.9 ADT pl
<p>If you encounter problems, ensure your ADT is fully uninstalled and then
follow the guide to
<a href="installingplugin">Installing the ADT Plugin
<a href="installing.html#installingplugin">Installing the ADT Plugin
for Eclipse</a>.</p>
<h3 id="updateEclipsePrefs">Update your Eclipse SDK Preferences</h3>

2
docs/html/sdk/installing.jd
View File

@ -360,7 +360,7 @@ begin developing applications. Here are a few ways you can get started: </p>
</ul>
<h2 id="troubleshooting">Installation Troubleshooting</h2>
<h2 id="troubleshooting">Troubleshooting</h2>
<h3>Ubuntu Linux Notes</h3>