diff options
| author | Mike LeBeau <mlebeau@android.com> | 2009-08-18 10:59:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-08-18 10:59:53 -0700 |
| commit | 93df578638418ef2f05efdf58331d847f41b17b5 (patch) | |
| tree | bea04717f62e3e8aba39e6a9a1a4e32003695567 /core | |
| parent | 5d8cbf8da3f44709bd9e64b10c037cdb543ffb17 (diff) | |
| parent | cfa419b754332e12f8cd45244c2f3bee9d6a74bb (diff) | |
| download | frameworks_base-93df578638418ef2f05efdf58331d847f41b17b5.zip frameworks_base-93df578638418ef2f05efdf58331d847f41b17b5.tar.gz frameworks_base-93df578638418ef2f05efdf58331d847f41b17b5.tar.bz2 | |
am cfa419b7: Correct comments for startSearch in Activity and SearchManager to explain Donut behavior correctly.
Merge commit 'cfa419b754332e12f8cd45244c2f3bee9d6a74bb' into eclair
* commit 'cfa419b754332e12f8cd45244c2f3bee9d6a74bb':
Correct comments for startSearch in Activity and SearchManager to explain
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/Activity.java | 2 | ||||
| -rw-r--r-- | core/java/android/app/SearchManager.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index c05e042..10e6299 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -2522,7 +2522,7 @@ public class Activity extends ContextThemeWrapper * no extra data is required. * @param globalSearch If false, this will only launch the search that has been specifically * defined by the application (which is usually defined as a local search). If no default - * search is defined in the current application or activity, no search will be launched. + * search is defined in the current application or activity, global search will be launched. * If true, this will always launch a platform-global (e.g. web-based) search instead. * * @see android.app.SearchManager diff --git a/core/java/android/app/SearchManager.java b/core/java/android/app/SearchManager.java index 15a277c..a460d19 100644 --- a/core/java/android/app/SearchManager.java +++ b/core/java/android/app/SearchManager.java @@ -1698,7 +1698,7 @@ public class SearchManager * no extra data is required. * @param globalSearch If false, this will only launch the search that has been specifically * defined by the application (which is usually defined as a local search). If no default - * search is defined in the current application or activity, no search will be launched. + * search is defined in the current application or activity, global search will be launched. * If true, this will always launch a platform-global (e.g. web-based) search instead. * * @see android.app.Activity#onSearchRequested |