From 6b13bc043e715b5415b701e93141daa0d49fa364 Mon Sep 17 00:00:00 2001 From: Dirk Dougherty Date: Fri, 30 Oct 2009 19:05:53 -0700 Subject: [PATCH] doc change: misc doc fixes. Bug:2160782 Change-Id: Iaf5d2cc2e3c657700469e8b7394a95bc03fc26f3 --- core/java/android/app/SearchManager.java | 6 +-- core/java/android/util/AttributeSet.java | 4 +- core/java/android/util/DisplayMetrics.java | 2 +- docs/html/guide/appendix/api-levels.jd | 2 +- .../guide/practices/design/responsiveness.jd | 2 +- .../practices/ui_guidelines/icon_design.jd | 44 +++++++++---------- docs/html/guide/publishing/versioning.jd | 2 +- docs/html/sdk/1.5_r3/upgrading.jd | 2 +- docs/html/sdk/installing.jd | 2 +- 9 files changed, 33 insertions(+), 33 deletions(-) diff --git a/core/java/android/app/SearchManager.java b/core/java/android/app/SearchManager.java index 3265ac452e18b..7f5a1e7bac538 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. *
  • 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 manifest.
    • *
  • 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; * } * diff --git a/core/java/android/util/AttributeSet.java b/core/java/android/util/AttributeSet.java index 01a7ad4840c26..82592b9f7e061 100644 --- a/core/java/android/util/AttributeSet.java +++ b/core/java/android/util/AttributeSet.java @@ -34,13 +34,13 @@ package android.util; *

    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: * * 

      * XmlPullParser parser = resources.getXml(myResouce);
- * AttributeSet attributes = Xml.getAttributeSet(parser);
    + * AttributeSet attributes = Xml.asAttributeSet(parser); * *

    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 74f01cc871975..2628eb4026d58 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. * *

    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 diff --git a/docs/html/guide/appendix/api-levels.jd b/docs/html/guide/appendix/api-levels.jd index 083003236a25b..cebd2d43891ad 100644 --- a/docs/html/guide/appendix/api-levels.jd +++ b/docs/html/guide/appendix/api-levels.jd @@ -18,7 +18,7 @@ page.title=Android API Levels

  • Using a Provisional API Level
    • -
  • Filtering the Reference Documentation by API Level
    • +
  • Filtering the Documentation

    • See also

    diff --git a/docs/html/guide/practices/design/responsiveness.jd b/docs/html/guide/practices/design/responsiveness.jd index ecd743d59550b..1d5a235e821d0 100644 --- a/docs/html/guide/practices/design/responsiveness.jd +++ b/docs/html/guide/practices/design/responsiveness.jd @@ -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.

    -

    The specific constraint on IntentReciever execution time emphasizes what +

    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 diff --git a/docs/html/guide/practices/ui_guidelines/icon_design.jd b/docs/html/guide/practices/ui_guidelines/icon_design.jd index 5f0a278bed92d..e5a1b5e29895f 100644 --- a/docs/html/guide/practices/ui_guidelines/icon_design.jd +++ b/docs/html/guide/practices/ui_guidelines/icon_design.jd @@ -847,118 +847,118 @@ icons in your applications.. - Android asset + Android asset

    Alarm Clock
    - Android asset + Android asset
    Browser
    - Android asset + Android asset
    Calculator
    - Android asset + Android asset
    Calendar
    - Android asset + Android asset
    Camcorder
    - Android asset + Android asset
    Camera
    - Android asset + Android asset
    Contacts
    - Android asset + Android asset
    Dialer
    - Android asset + Android asset
    Email
    - Android asset + Android asset
    Gallery
    - Android asset + Android asset
    Generic application
    - Android asset + Android asset
    Gmail
    - Android asset + Android asset
    Google Talk
    - Android asset + Android asset
    IM
    - Android asset + Android asset
    Maps
    - Android asset + Android asset
    Market
    - Android asset + Android asset
    Messaging
    - Android asset + Android asset
    Music
    - Android asset + Android asset
    Settings
    - Android asset + Android asset
    Voice Dialer
    - Android asset + Android asset
    Voice Search
    - Android asset + Android asset
    YouTube
    diff --git a/docs/html/guide/publishing/versioning.jd b/docs/html/guide/publishing/versioning.jd index 8d8b3041ebfa2..0bec658c9dc9c 100644 --- a/docs/html/guide/publishing/versioning.jd +++ b/docs/html/guide/publishing/versioning.jd @@ -165,4 +165,4 @@ maximum API Level.

    For more information, see the <uses- sdk> manifest element documentation and the API Levels document.

    +href="{@docRoot}guide/appendix/api-levels.html">API Levels document.

    diff --git a/docs/html/sdk/1.5_r3/upgrading.jd b/docs/html/sdk/1.5_r3/upgrading.jd index c79b65682a07f..f853d252dc015 100644 --- a/docs/html/sdk/1.5_r3/upgrading.jd +++ b/docs/html/sdk/1.5_r3/upgrading.jd @@ -187,7 +187,7 @@ uninstall procedure and continue to Install the 0.9 ADT pl

    If you encounter problems, ensure your ADT is fully uninstalled and then follow the guide to -Installing the ADT Plugin +Installing the ADT Plugin for Eclipse.

    Update your Eclipse SDK Preferences

    diff --git a/docs/html/sdk/installing.jd b/docs/html/sdk/installing.jd index 66c6bdccaadc7..edc77e83855f2 100644 --- a/docs/html/sdk/installing.jd +++ b/docs/html/sdk/installing.jd @@ -360,7 +360,7 @@ begin developing applications. Here are a few ways you can get started:

    -

    Installation Troubleshooting

    +

    Troubleshooting

    Ubuntu Linux Notes