diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-02 14:25:46 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-07-02 14:25:46 -0700 |
| commit | 29de5c4a40543d222f633087d61b1df06d8820e1 (patch) | |
| tree | 212471f2fdb7779cc7cd5cb177a7a74c9c1776ae /res | |
| parent | 88be2b6919f96037a84ba17b84692838aaf5ac42 (diff) | |
| parent | 944f2208fd134d74e171772cc6a317628ee20a5f (diff) | |
| download | packages_apps_Browser-29de5c4a40543d222f633087d61b1df06d8820e1.zip packages_apps_Browser-29de5c4a40543d222f633087d61b1df06d8820e1.tar.gz packages_apps_Browser-29de5c4a40543d222f633087d61b1df06d8820e1.tar.bz2 | |
am 944f2208: Merge change 5882 into donut
Merge commit '944f2208fd134d74e171772cc6a317628ee20a5f'
* commit '944f2208fd134d74e171772cc6a317628ee20a5f':
Add new searchSettingsDescription attribute for Browser's searchable.
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | res/xml/searchable.xml | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 9a90a53..6ad436e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -505,6 +505,8 @@ <!-- This string is for the browser "Go To" UI. --> <!-- This is the button label in the "Go To" UI. --> <string name="search_button_text">Go</string> + <!-- The string used to describe the browser as a searchable item within system search settings. --> + <string name="search_settings_description">Bookmarks and web history</string> <!-- Pop-up window dialog --> <!-- Title for a dialog informing the user that the site is attempting to diff --git a/res/xml/searchable.xml b/res/xml/searchable.xml index bb578c6..a3b2d90 100644 --- a/res/xml/searchable.xml +++ b/res/xml/searchable.xml @@ -27,6 +27,7 @@ android:inputType="textUri" android:imeOptions="actionGo" + android:searchSettingsDescription="@string/search_settings_description" android:searchSuggestAuthority="browser" android:searchSuggestSelection="url LIKE ?" android:searchSuggestIntentAction="android.intent.action.VIEW" |