Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 483d29c0 authored by Dirk Dougherty's avatar Dirk Dougherty Committed by Android Git Automerger
Browse files

am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk 

Merge commit '671c61d6' into eclair

* commit '671c61d6':
  doc change: misc doc fixes.
parents f67eff17 671c61d6

core/java/android/app/SearchManager.java

+3 −3
Original line number Diff line number Diff line
@@ -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> 

 *

core/java/android/util/AttributeSet.java

+2 −2
Original line number Diff line number Diff line
@@ -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,

core/java/android/util/DisplayMetrics.java

+1 −1
Original line number Diff line number Diff line
@@ -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

docs/html/guide/appendix/api-levels.jd

+1 −1
Original line number Diff line number Diff line
@@ -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>

docs/html/guide/practices/design/responsiveness.jd

+1 −1
Original line number Diff line number Diff line
@@ -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