diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-11-02 21:05:30 -0500 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-11-02 21:05:30 -0500 |
commit | 671c61d66f8d556f206d167d0f3c3bbe037ed86b (patch) | |
tree | 2a203ba3ed12712f313253a941850ce3fbb14b29 /core | |
parent | 3534daddeefefbd42ea0a3819348327e5d85315c (diff) | |
parent | 6b13bc043e715b5415b701e93141daa0d49fa364 (diff) | |
download | frameworks_base-671c61d66f8d556f206d167d0f3c3bbe037ed86b.zip frameworks_base-671c61d66f8d556f206d167d0f3c3bbe037ed86b.tar.gz frameworks_base-671c61d66f8d556f206d167d0f3c3bbe037ed86b.tar.bz2 |
Merge change Iaf5d2cc2 into eclair-sdk
* changes:
doc change: misc doc fixes.
Diffstat (limited to 'core')
-rw-r--r-- | core/java/android/app/SearchManager.java | 6 | ||||
-rw-r--r-- | core/java/android/util/AttributeSet.java | 4 | ||||
-rw-r--r-- | core/java/android/util/DisplayMetrics.java | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/core/java/android/app/SearchManager.java b/core/java/android/app/SearchManager.java index 3265ac4..7f5a1e7 100644 --- a/core/java/android/app/SearchManager.java +++ b/core/java/android/app/SearchManager.java @@ -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> * diff --git a/core/java/android/util/AttributeSet.java b/core/java/android/util/AttributeSet.java index 01a7ad4..82592b9 100644 --- a/core/java/android/util/AttributeSet.java +++ b/core/java/android/util/AttributeSet.java @@ -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, diff --git a/core/java/android/util/DisplayMetrics.java b/core/java/android/util/DisplayMetrics.java index 74f01cc..2628eb4 100644 --- a/core/java/android/util/DisplayMetrics.java +++ b/core/java/android/util/DisplayMetrics.java @@ -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 |