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

Commit 93df5786 authored by Mike LeBeau's avatar Mike LeBeau Committed by Android Git Automerger
Browse files

am cfa419b7: Correct comments for startSearch in Activity and SearchManager to... 

am cfa419b7: Correct comments for startSearch in Activity and SearchManager to explain Donut behavior correctly.

Merge commit 'cfa419b7' into eclair

* commit 'cfa419b7':
  Correct comments for startSearch in Activity and SearchManager to explain
parents 5d8cbf8d cfa419b7

core/java/android/app/Activity.java

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

core/java/android/app/SearchManager.java

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