Adds third party web search & suggest providers.

The XML files under res/ will be automatically generated with a script in a subsequent change.
The design is documented in the 'Design' section of https://docs.google.com/a/google.com/Doc?docid=0AUpt8mrQCqRkZGdnOGtmZzJfNWRwbXJndDc1

16 files changed, 1077 insertions, 53 deletions

diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000..d1200d9
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,27 @@
+#
+# Copyright (C) 2009 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := user # should be optional, but launcher crashes without this
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+
+LOCAL_PACKAGE_NAME := WebSearch
+LOCAL_CERTIFICATE := shared
+
+include $(BUILD_PACKAGE)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
new file mode 100644
index 0000000..b5cbe3e
--- /dev/null
+++ b/AndroidManifest.xml
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.websearch"
+    android:sharedUserId="android.uid.shared">
+
+    <application android:label="Web Search"
+        android:process="android.process.acore">
+
+        <activity android:name=".WebSearch"
+                android:theme="@android:style/Theme.NoDisplay"
+                android:excludeFromRecents="true">
+        </activity>
+
+        <!--
+        /*
+         * The following activity aliases act as the various built-in web search and suggest
+         * providers exported from this package. The provider names and enabled flag values come
+         * from strings.xml for the current locale. This allows us to define a static list of
+         * providers for each locale and let the runtime take care of selecting the appropriate
+         * ones.
+         */
+        -->
+        <activity-alias android:name=".Search.1"
+                android:label="@string/engine_1_label"
+                android:enabled="@bool/engine_1_enabled"
+                android:targetActivity=".WebSearch">
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.WEB_SEARCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="android.app.searchable"
+                android:resource="@xml/searchable_1" />
+        </activity-alias>
+
+        <activity-alias android:name=".Search.2"
+                android:label="@string/engine_2_label"
+                android:enabled="@bool/engine_2_enabled"
+                android:targetActivity=".WebSearch">
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.WEB_SEARCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="android.app.searchable"
+                android:resource="@xml/searchable_2" />
+        </activity-alias>
+
+        <activity-alias android:name=".Search.3"
+                android:label="@string/engine_3_label"
+                android:enabled="@bool/engine_3_enabled"
+                android:targetActivity=".WebSearch">
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.WEB_SEARCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="android.app.searchable"
+                android:resource="@xml/searchable_3" />
+        </activity-alias>
+
+        <activity-alias android:name=".Search.4"
+                android:label="@string/engine_4_label"
+                android:enabled="@bool/engine_4_enabled"
+                android:targetActivity=".WebSearch">
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.WEB_SEARCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="android.app.searchable"
+                android:resource="@xml/searchable_4" />
+        </activity-alias>
+
+        <activity-alias android:name=".Search.5"
+                android:label="@string/engine_5_label"
+                android:enabled="@bool/engine_5_enabled"
+                android:targetActivity=".WebSearch">
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.WEB_SEARCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="android.app.searchable"
+                android:resource="@xml/searchable_5" />
+        </activity-alias>
+
+        <activity-alias android:name=".Search.6"
+                android:label="@string/engine_6_label"
+                android:enabled="@bool/engine_6_enabled"
+                android:targetActivity=".WebSearch">
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.WEB_SEARCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="android.app.searchable"
+                android:resource="@xml/searchable_6" />
+        </activity-alias>
+
+        <activity-alias android:name=".Search.7"
+                android:label="@string/engine_7_label"
+                android:enabled="@bool/engine_7_enabled"
+                android:targetActivity=".WebSearch">
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.WEB_SEARCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="android.app.searchable"
+                android:resource="@xml/searchable_7" />
+        </activity-alias>
+
+        <!--
+        /*
+         * The number of suggest authorities defined below is exactly the same as the number of
+         * activity-alias elements defined above.
+         */
+        -->
+        <provider android:name=".SuggestionProvider"
+            android:authorities="com.android.websearch.Suggest" />
+    </application>
+</manifest>
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..9df2554
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,190 @@
+
+   Copyright (c) 2005-2009, The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
diff --git a/res/values-en-rGB/search_engines.xml b/res/values-en-rGB/search_engines.xml
new file mode 100644
index 0000000..c799804
--- /dev/null
+++ b/res/values-en-rGB/search_engines.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<!--
+****
+**** THIS IS AN AUTOGENERATED FILE.
+**** PLEASE DO NOT EDIT IT MANUALLY WITHOUT REMOVING THIS NOTICE.
+****
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <bool   name="engine_1_enabled">true</bool>
+    <string name="engine_1_name">yahoo_uk</string>
+    <string name="engine_1_label">Yahoo</string>
+
+    <bool   name="engine_2_enabled">true</bool>
+    <string name="engine_2_name">msn_en_GB</string>
+    <string name="engine_2_label">MSN</string>
+
+    <bool   name="engine_3_enabled">true</bool>
+    <string name="engine_3_name">ask_uk</string>
+    <string name="engine_3_label">Ask</string>
+
+    <bool   name="engine_4_enabled">false</bool>
+    <string name="engine_4_name"></string>
+    <string name="engine_4_label"></string>
+
+    <bool   name="engine_5_enabled">false</bool>
+    <string name="engine_5_name"></string>
+    <string name="engine_5_label"></string>
+
+    <bool   name="engine_6_enabled">false</bool>
+    <string name="engine_6_name"></string>
+    <string name="engine_6_label"></string>
+
+    <bool   name="engine_7_enabled">false</bool>
+    <string name="engine_7_name"></string>
+    <string name="engine_7_label"></string>
+</resources>
diff --git a/res/values/all_search_engines.xml b/res/values/all_search_engines.xml
new file mode 100644
index 0000000..fc73bc1
--- /dev/null
+++ b/res/values/all_search_engines.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<!--
+****
+**** THIS IS AN AUTOGENERATED FILE.
+**** PLEASE DO NOT EDIT IT MANUALLY WITHOUT REMOVING THIS NOTICE.
+****
+
+Each string-array item below refers to one search engine in a specific locale, and the name of the
+item is referred to by the <engine_X_name> items in the locale specific search_engines.xml file.
+
+Format:
+  - Keyword: empty string if the engine has no keyword.
+  - Favicon
+  - Search URL
+  - Encoding
+  - Suggest URL: empty string if this engine has no suggest feature
+
+The parameters enclosed in curly brackets come from the OpenSearch specification. More about them
+at http://www.opensearch.org/Specifications/OpenSearch/1.1/Draft_4#OpenSearch_1.1_parameters
+-->
+
+<resources>
+  <string-array name="yahoo">
+    <item>yahoo.com</item>
+    <item>http://search.yahoo.com/favicon.ico</item>
+    <item>http://search.yahoo.com/search?ei={inputEncoding}&amp;fr=crmas&amp;p={searchTerms}</item>
+    <item>UTF-8</item>
+    <item>http://ff.search.yahoo.com/gossip?output=fxjson&amp;command={searchTerms}</item>
+  </string-array>
+  <string-array name="yahoo_uk">
+    <item>uk.yahoo.com</item>
+    <item>http://uk.search.yahoo.com/favicon.ico</item>
+    <item>http://uk.search.yahoo.com/search?ei={inputEncoding}&amp;fr=crmas&amp;p={searchTerms}</item>
+    <item>UTF-8</item>
+    <item>http://uk-sayt.ff.search.yahoo.com/gossip-uk-sayt?output=fxjson&amp;command={searchTerms}</item>
+  </string-array>
+  <string-array name="aol">
+    <item>aol.com</item>
+    <item>http://search.aol.com/favicon.ico</item>
+    <item>http://search.aol.com/aol/search?query={searchTerms}</item>
+    <item>UTF-8</item>
+    <item></item>
+  </string-array>
+  <string-array name="ask">
+    <item>ask.com</item>
+    <item>http://www.ask.com/favicon.ico</item>
+    <item>http://www.ask.com/web?q={searchTerms}</item>
+    <item>UTF-8</item>
+    <item>http://ss.ask.com/query?q={searchTerms}&amp;li=ff</item>
+  </string-array>
+  <string-array name="ask_uk">
+    <item>uk.ask.com</item>
+    <item>http://uk.ask.com/favicon.ico</item>
+    <item>http://uk.ask.com/web?q={searchTerms}</item>
+    <item>UTF-8</item>
+    <item>http://ss.uk.ask.com/query?q={searchTerms}&amp;li=ff</item>
+  </string-array>
+  <string-array name="live_en_US">
+    <item>live.com</item>
+    <item>http://search.live.com/s/wlflag.ico</item>
+    <item>http://search.live.com/results.aspx?setlang=en-US&amp;mkt=en-US&amp;q={searchTerms}</item>
+    <item>UTF-8</item>
+    <item></item>
+  </string-array>
+  <string-array name="msn_en_GB">
+    <item>uk.msn.com</item>
+    <item>http://search.msn.co.uk/s/wlflag.ico</item>
+    <item>http://search.msn.co.uk/results.aspx?mkt=en-GB&amp;q={searchTerms}</item>
+    <item>UTF-8</item>
+    <item></item>
+  </string-array>
+</resources>
diff --git a/res/values/search_engines.xml b/res/values/search_engines.xml
new file mode 100644
index 0000000..3cd80fe
--- /dev/null
+++ b/res/values/search_engines.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<!--
+****
+**** THIS IS AN AUTOGENERATED FILE.
+**** PLEASE DO NOT EDIT IT MANUALLY WITHOUT REMOVING THIS NOTICE.
+****
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <bool   name="engine_1_enabled">true</bool>
+    <string name="engine_1_name">yahoo</string>
+    <string name="engine_1_label">Yahoo</string>
+
+    <bool   name="engine_2_enabled">true</bool>
+    <string name="engine_2_name">live_en_US</string>
+    <string name="engine_2_label">MSN</string>
+
+    <bool   name="engine_3_enabled">true</bool>
+    <string name="engine_3_name">aol</string>
+    <string name="engine_3_label">AOL</string>
+
+    <bool   name="engine_4_enabled">true</bool>
+    <string name="engine_4_name">ask</string>
+    <string name="engine_4_label">Ask</string>
+
+    <bool   name="engine_5_enabled">false</bool>
+    <string name="engine_5_name"></string>
+    <string name="engine_5_label"></string>
+
+    <bool   name="engine_6_enabled">false</bool>
+    <string name="engine_6_name"></string>
+    <string name="engine_6_label"></string>
+
+    <bool   name="engine_7_enabled">false</bool>
+    <string name="engine_7_name"></string>
+    <string name="engine_7_label"></string>
+</resources>
diff --git a/res/xml/searchable_1.xml b/res/xml/searchable_1.xml
new file mode 100644
index 0000000..8e8a027
--- /dev/null
+++ b/res/xml/searchable_1.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<searchable xmlns:android="http://schemas.android.com/apk/res/android"
+    android:label="@string/engine_1_label"
+    android:voiceSearchMode="showVoiceSearchButton|launchWebSearch"
+
+    android:searchSuggestAuthority="com.android.websearch.Suggest"
+    android:searchSuggestSelection="field =?"
+    android:searchSuggestPath="1"
+    android:searchSuggestThreshold="3"
+    android:searchSuggestIntentAction="android.intent.action.WEB_SEARCH"
+/>
diff --git a/res/xml/searchable_2.xml b/res/xml/searchable_2.xml
new file mode 100644
index 0000000..7928eee
--- /dev/null
+++ b/res/xml/searchable_2.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<searchable xmlns:android="http://schemas.android.com/apk/res/android"
+    android:label="@string/engine_2_label"
+    android:voiceSearchMode="showVoiceSearchButton|launchWebSearch"
+
+    android:searchSuggestAuthority="com.android.websearch.Suggest"
+    android:searchSuggestSelection="field =?"
+    android:searchSuggestPath="2"
+    android:searchSuggestThreshold="3"
+    android:searchSuggestIntentAction="android.intent.action.WEB_SEARCH"
+/>
diff --git a/res/xml/searchable_3.xml b/res/xml/searchable_3.xml
new file mode 100644
index 0000000..a8092dc
--- /dev/null
+++ b/res/xml/searchable_3.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<searchable xmlns:android="http://schemas.android.com/apk/res/android"
+    android:label="@string/engine_3_label"
+    android:voiceSearchMode="showVoiceSearchButton|launchWebSearch"
+
+    android:searchSuggestAuthority="com.android.websearch.Suggest"
+    android:searchSuggestSelection="field =?"
+    android:searchSuggestPath="3"
+    android:searchSuggestThreshold="3"
+    android:searchSuggestIntentAction="android.intent.action.WEB_SEARCH"
+/>
diff --git a/res/xml/searchable_4.xml b/res/xml/searchable_4.xml
new file mode 100644
index 0000000..dc911c9
--- /dev/null
+++ b/res/xml/searchable_4.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<searchable xmlns:android="http://schemas.android.com/apk/res/android"
+    android:label="@string/engine_4_label"
+    android:voiceSearchMode="showVoiceSearchButton|launchWebSearch"
+
+    android:searchSuggestAuthority="com.android.websearch.Suggest"
+    android:searchSuggestSelection="field =?"
+    android:searchSuggestPath="4"
+    android:searchSuggestThreshold="3"
+    android:searchSuggestIntentAction="android.intent.action.WEB_SEARCH"
+/>
diff --git a/res/xml/searchable_5.xml b/res/xml/searchable_5.xml
new file mode 100644
index 0000000..2ebcf01
--- /dev/null
+++ b/res/xml/searchable_5.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<searchable xmlns:android="http://schemas.android.com/apk/res/android"
+    android:label="@string/engine_5_label"
+    android:voiceSearchMode="showVoiceSearchButton|launchWebSearch"
+
+    android:searchSuggestAuthority="com.android.websearch.Suggest"
+    android:searchSuggestSelection="field =?"
+    android:searchSuggestPath="5"
+    android:searchSuggestThreshold="3"
+    android:searchSuggestIntentAction="android.intent.action.WEB_SEARCH"
+/>
diff --git a/res/xml/searchable_6.xml b/res/xml/searchable_6.xml
new file mode 100644
index 0000000..4db83d2
--- /dev/null
+++ b/res/xml/searchable_6.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<searchable xmlns:android="http://schemas.android.com/apk/res/android"
+    android:label="@string/engine_6_label"
+    android:voiceSearchMode="showVoiceSearchButton|launchWebSearch"
+
+    android:searchSuggestAuthority="com.android.websearch.Suggest"
+    android:searchSuggestSelection="field =?"
+    android:searchSuggestPath="6"
+    android:searchSuggestThreshold="3"
+    android:searchSuggestIntentAction="android.intent.action.WEB_SEARCH"
+/>
diff --git a/res/xml/searchable_7.xml b/res/xml/searchable_7.xml
new file mode 100644
index 0000000..ee45659
--- /dev/null
+++ b/res/xml/searchable_7.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<searchable xmlns:android="http://schemas.android.com/apk/res/android"
+    android:label="@string/engine_7_label"
+    android:voiceSearchMode="showVoiceSearchButton|launchWebSearch"
+
+    android:searchSuggestAuthority="com.android.websearch.Suggest"
+    android:searchSuggestSelection="field =?"
+    android:searchSuggestPath="7"
+    android:searchSuggestThreshold="3"
+    android:searchSuggestIntentAction="android.intent.action.WEB_SEARCH"
+/>
diff --git a/src/com/android/websearch/SearchEngineInfo.java b/src/com/android/websearch/SearchEngineInfo.java
new file mode 100644
index 0000000..8a38ff7
--- /dev/null
+++ b/src/com/android/websearch/SearchEngineInfo.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.websearch;
+
+import java.net.URLEncoder;
+import java.util.Locale;
+
+import android.content.Context;
+import android.content.ComponentName;
+import android.content.res.Resources;
+import android.text.TextUtils;
+import android.util.Log;
+
+
+/**
+ * Loads and holds data for a given web search engine.
+ */
+public class SearchEngineInfo {
+    private static String LOG_TAG = "SearchEngineInfo";
+
+    // The fields of a search engine data array, defined in the same order as they appear in the
+    // all_search_engines.xml file.
+    // If you are adding/removing to this list, remember to update NUM_FIELDS below.
+    static final int FIELD_KEYWORD = 0;
+    static final int FIELD_FAVICON_URI = 1;
+    static final int FIELD_SEARCH_URI = 2;
+    static final int FIELD_ENCODING = 3;
+    static final int FIELD_SUGGEST_URI = 4;
+    static final int NUM_FIELDS = 5;
+
+    // The OpenSearch URI template parameters that we support.
+    private static final String PARAMETER_LANGUAGE = "{language}";
+    private static final String PARAMETER_SEARCH_TERMS = "{searchTerms}";
+    private static final String PARAMETER_INPUT_ENCODING = "{inputEncoding}";
+
+    // The array of strings defining this search engine. The array values are in the same order as
+    // the above enumeration definition.
+    private String[] mSearchEngineData = null;
+
+    private Context mContext = null;
+
+    /*
+     * @param index is the numerical value in the search engine name resource, starts from 1. This
+     * is typically obtained as the last word in the content URI path field or the intent class name
+     * field.
+     * @throws IllegalArgumentException If the index does not refer to a valid search engine
+     */
+    public SearchEngineInfo(Context context, String index) throws IllegalArgumentException {
+        mContext = context;
+        String resourceName = "engine_" + index + "_name";
+        Resources res = mContext.getResources();
+        int id_name = res.getIdentifier(resourceName, "string", mContext.getPackageName());
+        if (id_name == 0) {
+            throw new IllegalArgumentException("No such resource - " + resourceName);
+        }
+
+        String searchEngineName = res.getString(id_name);
+        int id_data = res.getIdentifier(searchEngineName, "array", mContext.getPackageName());
+        mSearchEngineData = res.getStringArray(id_data);
+
+        if (mSearchEngineData == null) {
+            throw new IllegalArgumentException("No data found for " + resourceName);
+        }
+        if (mSearchEngineData.length != NUM_FIELDS) {
+            throw new IllegalArgumentException(
+                    resourceName + " has invalid number of fields - " + mSearchEngineData.length);
+        }
+        if (TextUtils.isEmpty(mSearchEngineData[FIELD_SEARCH_URI])) {
+            throw new IllegalArgumentException(resourceName + " has an empty search URI");
+        }
+
+        // Add the current language/country information to the URIs.
+        Locale locale = mContext.getResources().getConfiguration().locale;
+        StringBuilder language = new StringBuilder(locale.getLanguage());
+        if (!TextUtils.isEmpty(locale.getCountry())) {
+            language.append('-');
+            language.append(locale.getCountry());
+        }
+
+        String language_str = language.toString();
+        mSearchEngineData[FIELD_SEARCH_URI] =
+            mSearchEngineData[FIELD_SEARCH_URI].replace(PARAMETER_LANGUAGE, language_str);
+        mSearchEngineData[FIELD_SUGGEST_URI] =
+            mSearchEngineData[FIELD_SUGGEST_URI].replace(PARAMETER_LANGUAGE, language_str);
+
+        // Default to UTF-8 if not specified.
+        String enc = mSearchEngineData[FIELD_ENCODING];
+        if (TextUtils.isEmpty(enc)) {
+            enc = "UTF-8";
+            mSearchEngineData[FIELD_ENCODING] = enc;
+        }
+
+        // Add the input encoding method to the URI.
+        mSearchEngineData[FIELD_SEARCH_URI] =
+            mSearchEngineData[FIELD_SEARCH_URI].replace(PARAMETER_INPUT_ENCODING, enc);
+        mSearchEngineData[FIELD_SUGGEST_URI] =
+            mSearchEngineData[FIELD_SUGGEST_URI].replace(PARAMETER_INPUT_ENCODING, enc);
+    }
+
+    /*
+     * Returns the URI for launching a web search with the given query (or null if there was no
+     * data available for this search engine).
+     */
+    public String getSearchUriForQuery(String query) {
+        return getFormattedUri(searchUri(), query);
+    }
+
+    /*
+     * Returns the URI for retrieving web search suggestions for the given query (or null if there
+     * was no data available for this search engine).
+     */
+    public String getSuggestUriForQuery(String query) {
+        return getFormattedUri(suggestUri(), query);
+    }
+
+    public String faviconUri() {
+        return mSearchEngineData[FIELD_FAVICON_URI];
+    }
+
+    private String suggestUri() {
+        return mSearchEngineData[FIELD_SUGGEST_URI];
+    }
+
+    private String searchUri() {
+        return mSearchEngineData[FIELD_SEARCH_URI];
+    }
+
+    /*
+     * Formats a launchable uri out of the template uri by replacing the template parameters with
+     * actual values.
+     */
+    private String getFormattedUri(String templateUri, String query) {
+        if (TextUtils.isEmpty(templateUri)) {
+            return null;
+        }
+
+        // Encode the query terms in the requested encoding (and fallback to UTF-8 if not).
+        String enc = mSearchEngineData[FIELD_ENCODING];
+        try {
+            return templateUri.replace(PARAMETER_SEARCH_TERMS, URLEncoder.encode(query, enc));
+        } catch (java.io.UnsupportedEncodingException e) {
+            Log.e(LOG_TAG, "Exception occured when encoding query " + query + " to " + enc);
+            return null;
+        }
+    }
+}
diff --git a/src/com/android/websearch/SuggestionProvider.java b/src/com/android/websearch/SuggestionProvider.java
index 416f9d0..1c45472 100644
--- a/src/com/android/websearch/SuggestionProvider.java
+++ b/src/com/android/websearch/SuggestionProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 The Android Open Source Project
+ * Copyright (C) 2009 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.googlesearch;
+package com.android.websearch;
 
 import com.android.internal.database.ArrayListCursor;
 import com.google.android.net.GoogleHttpClient;
@@ -31,6 +31,7 @@ import org.json.JSONException;
 import android.app.SearchManager;
 import android.content.ContentProvider;
 import android.content.ContentValues;
+import android.content.Context;
 import android.database.AbstractCursor;
 import android.database.Cursor;
 import android.net.Uri;
@@ -41,36 +42,43 @@ import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Locale;
 
 /**
  * Use network-based Google Suggests to provide search suggestions.
- * 
+ *
  * Future:  Merge live suggestions with saved recent queries
  */
 public class SuggestionProvider extends ContentProvider {
-    
-    public static final Uri CONTENT_URI = Uri.parse(
-            "content://com.android.googlesearch.SuggestionProvider");
-
     private static final String USER_AGENT = "Android/1.0";
-    private String mSuggestUri;
     private static final int HTTP_TIMEOUT_MS = 1000;
-    
+
     // TODO: this should be defined somewhere
     private static final String HTTP_TIMEOUT = "http.connection-manager.timeout";
 
-    private static final String LOG_TAG = "GoogleSearch.SuggestionProvider";
-    
+    private static final String LOG_TAG = "WebSearch.SuggestionProvider";
+
     /* The suggestion columns used */
     private static final String[] COLUMNS = new String[] {
-            "_id",
-            SearchManager.SUGGEST_COLUMN_TEXT_1,
-            SearchManager.SUGGEST_COLUMN_TEXT_2,
-            SearchManager.SUGGEST_COLUMN_QUERY};
+        "_id",
+        SearchManager.SUGGEST_COLUMN_QUERY,
+        SearchManager.SUGGEST_COLUMN_TEXT_1,
+        SearchManager.SUGGEST_COLUMN_TEXT_2,
+    };
+
+    private static final String[] COLUMNS_WITHOUT_DESCRIPTION = new String[] {
+        "_id",
+        SearchManager.SUGGEST_COLUMN_QUERY,
+        SearchManager.SUGGEST_COLUMN_TEXT_1,
+    };
 
     private HttpClient mHttpClient;
 
+    private final HashMap<String, SearchEngineInfo> mSearchEngines =
+        new HashMap<String, SearchEngineInfo>();
+
     @Override
     public boolean onCreate() {
         mHttpClient = new GoogleHttpClient(getContext().getContentResolver(),
@@ -78,9 +86,6 @@ public class SuggestionProvider extends ContentProvider {
         HttpParams params = mHttpClient.getParams();
         params.setLongParameter(HTTP_TIMEOUT, HTTP_TIMEOUT_MS);
 
-        // NOTE:  Do not look up the resource here;  Localization changes may not have completed
-        // yet (e.g. we may still be reading the SIM card).
-        mSuggestUri = null;
         return true;
     }
 
@@ -106,43 +111,63 @@ public class SuggestionProvider extends ContentProvider {
             String[] selectionArgs, String sortOrder) {
         String query = selectionArgs[0];
         if (TextUtils.isEmpty(query)) {
-            
-            /* Can't pass back null, things blow up */
+            // Can't pass back null, things blow up
             return makeEmptyCursor();
         }
-        try {
-            query = URLEncoder.encode(query, "UTF-8");
-            // NOTE:  This code uses resources to optionally select the search Uri, based on the
-            // MCC value from the SIM.  iThe default string will most likely be fine.  It is
-            // paramerterized to accept info from the Locale, the language code is the first
-            // parameter (%1$s) and the country code is the second (%2$s).  This code *must* 
-            // function in the same way as a similar lookup in
-            // com.android.browser.BrowserActivity#onCreate().  If you change
-            // either of these functions, change them both.  (The same is true for the underlying
-            // resource strings, which are stored in mcc-specific xml files.)
-            if (mSuggestUri == null) {
-                Locale l = Locale.getDefault();
-                mSuggestUri = getContext().getResources().getString(R.string.google_search_base,
-                                                                    l.getLanguage(), 
-                                                                    l.getCountry().toLowerCase()) 
-                        + "json=true&q=";
+
+        List<String> parts = uri.getPathSegments();
+        if (parts.size() < 2) {
+            Log.i(LOG_TAG, "Invalid URI " + uri.toString());
+            return makeEmptyCursor();
+        }
+
+        // Check if the specific search engine data is already loaded and if not load it now.
+        String engine_index = parts.get(parts.size() - 2);
+        SearchEngineInfo engine = null;
+        synchronized(this) {
+            engine = mSearchEngines.get(engine_index);
+            if (engine == null) {
+                try {
+                    engine = new SearchEngineInfo(getContext(), engine_index);
+                } catch (IllegalArgumentException exception) {
+                    Log.e(LOG_TAG, "Cannot load search engine index " + engine_index, exception);
+                    return makeEmptyCursor();
+                }
+                mSearchEngines.put(engine_index, engine);
             }
+        }
+
+        String suggestUri = engine.getSuggestUriForQuery(query);
+        Log.i(LOG_TAG, suggestUri);
+        if (TextUtils.isEmpty(suggestUri)) {
+            // No suggest URI available for this engine
+            return makeEmptyCursor();
+        }
 
-            HttpPost method = new HttpPost(mSuggestUri + query);
+        try {
+            HttpPost method = new HttpPost(suggestUri);
             StringEntity content = new StringEntity("");
             method.setEntity(content);
             HttpResponse response = mHttpClient.execute(method);
             if (response.getStatusLine().getStatusCode() == 200) {
-                
-                /* Goto http://www.google.com/complete/search?json=true&q=foo
-                 * to see what the data format looks like. It's basically a json
-                 * array containing 4 other arrays. We only care about the middle
-                 * 2 which contain the suggestions and their popularity.
+                /* The data format is a JSON array with items being regular strings or JSON arrays
+                 * themselves. We are interested in the second and third elements, both of which
+                 * should be JSON arrays. The second element/array contains the suggestions and the
+                 * third element contains the descriptions. Some search engines don't support
+                 * suggestion descriptions so the third element is optional.
                  */
                 JSONArray results = new JSONArray(EntityUtils.toString(response.getEntity()));
                 JSONArray suggestions = results.getJSONArray(1);
-                JSONArray popularity = results.getJSONArray(2);
-                return new SuggestionsCursor(suggestions, popularity);
+                JSONArray descriptions = null;
+                if (results.length() > 2) {
+                    descriptions = results.getJSONArray(2);
+                    // Some search engines given an empty array "[]" for descriptions instead of
+                    // not including it in the response.
+                    if (descriptions.length() == 0) {
+                        descriptions = null;
+                    }
+                }
+                return new SuggestionsCursor(suggestions, descriptions);
             }
         } catch (UnsupportedEncodingException e) {
             Log.w(LOG_TAG, "Error", e);
@@ -158,14 +183,14 @@ public class SuggestionProvider extends ContentProvider {
 
         /* Contains the actual suggestions */
         final JSONArray mSuggestions;
-        
+
         /* This contains the popularity of each suggestion
          * i.e. 165,000 results. It's not related to sorting.
          */
-        final JSONArray mPopularity;
-        public SuggestionsCursor(JSONArray suggestions, JSONArray popularity) {
+        final JSONArray mDescriptions;
+        public SuggestionsCursor(JSONArray suggestions, JSONArray descriptions) {
             mSuggestions = suggestions;
-            mPopularity = popularity;
+            mDescriptions = descriptions;
         }
 
         @Override
@@ -175,21 +200,21 @@ public class SuggestionProvider extends ContentProvider {
 
         @Override
         public String[] getColumnNames() {
-            return COLUMNS;
+            return (mDescriptions != null ? COLUMNS : COLUMNS_WITHOUT_DESCRIPTION);
         }
 
         @Override
         public String getString(int column) {
             if ((mPos != -1)) {
-                if ((column == 1) || (column == 3)) {
+                if ((column == 1) || (column == 2)) {
                     try {
                         return mSuggestions.getString(mPos);
                     } catch (JSONException e) {
                         Log.w(LOG_TAG, "Error", e);
                     }
-                } else if (column == 2) {
+                } else if (column == 3) {
                     try {
-                        return mPopularity.getString(mPos);
+                        return mDescriptions.getString(mPos);
                     } catch (JSONException e) {
                         Log.w(LOG_TAG, "Error", e);
                     }
@@ -231,7 +256,7 @@ public class SuggestionProvider extends ContentProvider {
             throw new UnsupportedOperationException();
         }
     }
-    
+
     @Override
     public Uri insert(Uri uri, ContentValues values) {
         throw new UnsupportedOperationException();
diff --git a/src/com/android/websearch/WebSearch.java b/src/com/android/websearch/WebSearch.java
new file mode 100644
index 0000000..a625f06
--- /dev/null
+++ b/src/com/android/websearch/WebSearch.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.websearch;
+
+import android.app.Activity;
+import android.app.SearchManager;
+import android.content.Context;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.net.Uri;
+import android.os.Bundle;
+import android.provider.SearchRecentSuggestions;
+import android.text.TextUtils;
+import android.util.Log;
+
+/**
+ * This class routes the web search intent action on web suggestion results to the browser and opens
+ * up the appropriate search engine results page.
+ */
+public class WebSearch extends Activity {
+    public static final String LOG_TAG = "WebSearch";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Intent intent = getIntent();
+        if (intent != null && Intent.ACTION_WEB_SEARCH.equals(intent.getAction())) {
+            // Fetch the provider index for which this action was launched and load the provider
+            // data.
+            String[] parts = intent.getComponent().getClassName().split("\\.");
+            String engine_index = parts[parts.length - 1];
+            SearchEngineInfo engine = null;
+            try {
+                engine = new SearchEngineInfo((Context)this, engine_index);
+
+                // Format the URI to launch and open it in the browser.
+                String query = intent.getStringExtra(SearchManager.QUERY);
+                String launchUri = engine.getSearchUriForQuery(query);
+                if (launchUri == null) {
+                    Log.e(LOG_TAG, "Unable to get search URI for engine index " + engine_index);
+                } else {
+                    intent = new Intent(Intent.ACTION_VIEW, Uri.parse(launchUri));
+                    startActivity(intent);
+                }
+            } catch (IllegalArgumentException exception) {
+                Log.e(LOG_TAG, "Cannot load search engine index " + engine_index, exception);
+            }
+        }
+        finish();
+    }
+}