Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 483d29c0: am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk

Browse Source 
Merge commit '483d29c0ddc9f4c110a8a8788ccd978010d55aa4' into eclair-plus-aosp

* commit '483d29c0ddc9f4c110a8a8788ccd978010d55aa4':
  doc change: misc doc fixes.
This commit is contained in:
Dirk Dougherty
2009-11-02 18:27:55 -08:00
committed by Android Git Automerger
parent d4048822ef 483d29c0dd
commit f93cf36964
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