commit e73a05361d6faaefcd444a91890f714ac8e3b839
author Bjorn Bringert <bringert@android.com> Mon Jul 13 09:02:30 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Mon Jul 13 09:02:30 2009 -0700
tree d597203e72ff1f47464103ae2d20079a4a6f2740
parent b4645a19f55ede86b59cf123eb15b913fddd135a
parent 1e8f0583fb74658666dc4105bf15788f2585a6a2

am 1e8f0583: Move Browser search description to bookmarks search.

Merge commit '1e8f0583fb74658666dc4105bf15788f2585a6a2'

* commit '1e8f0583fb74658666dc4105bf15788f2585a6a2':
  Move Browser search description to bookmarks search.

res/xml/bookmarks_searchable.xml

diff --git a/res/xml/bookmarks_searchable.xml b/res/xml/bookmarks_searchable.xml
index bc6ac93..de56add 100644
--- a/res/xml/bookmarks_searchable.xml
+++ b/res/xml/bookmarks_searchable.xml
@@ -22,6 +22,7 @@
     android:imeOptions="actionGo"
 
     android:includeInGlobalSearch="true"
+    android:searchSettingsDescription="@string/search_settings_description"
     android:searchSuggestAuthority="browser"
     android:searchSuggestPath="bookmarks"
     android:searchSuggestSelection="url LIKE ?"

res/xml/searchable.xml

diff --git a/res/xml/searchable.xml b/res/xml/searchable.xml
index a3b2d90..bb578c6 100644
--- a/res/xml/searchable.xml
+++ b/res/xml/searchable.xml
@@ -27,7 +27,6 @@
     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"