commit e75909d7f96ab75c64be108f48a9bcc0934ae070
author Bijan Amirzada <bijana@codeaurora.org> Tue May 06 14:18:54 2014 -0700
committer WebTech Code Review <code-review@localhost> Wed May 14 14:06:55 2014 -0700
tree 37e80713db92de7b004ab832fe7dd343c33cba4e
parent cc4bc5e7d0725fc7812da90bf48d6621aedc595a

Changes to conform to new overlay format

- Added new overlay resources and checks for new resource values
- Removed all references to carrier specific lookups and
converted them to overlay implementations instead.
- Removed old resources from assets directory

Change-Id: I5143b499ffb6f1e08d1f9c846eec94300de87561

res/values/all_search_engines.xml

diff --git a/res/values/all_search_engines.xml b/res/values/all_search_engines.xml
index 4fee10a..2c199f3 100644
--- a/res/values/all_search_engines.xml
+++ b/res/values/all_search_engines.xml
@@ -148,23 +148,6 @@
     <item>UTF-8</item>
     <item>http://api.bing.com/osjson.aspx?query={searchTerms}&amp;language={language}</item>
   </string-array>
-  <string-array name="cmcc_cn" translatable="false">
-    <item>&#x79FB;&#x52A8;&#x641C;&#x7D22;</item>
-    <item>s.139.com</item>
-    <item>http://s.139.com/favicon.ico</item>
-    <item>http://s.139.com/search.do?q={searchTerms}&amp;category=downloadable|web|browseable&amp;tid=2123,2124,2125,2126&amp;fr=portalcustom2</item>
-    <item>GB2312</item>
-    <item></item>
-  </string-array>
-
-  <string-array name="cmcc" translatable="false">
-    <item>139 Search</item>
-    <item>s.139.com</item>
-    <item>http://s.139.com/favicon.ico</item>
-    <item>http://s.139.com/search.do?q={searchTerms}&amp;category=downloadable|web|browseable&amp;tid=2123,2124,2125,2126&amp;fr=portalcustom2</item>
-    <item>UTF-8</item>
-    <item></item>
-  </string-array>
   <string-array name="yahoo_cn" translatable="false">
     <item>&#x4e2d;&#x56fd;&#x96c5;&#x864e;</item>
     <item>cn.yahoo.com</item>
@@ -773,5 +756,47 @@
     <item>UTF-8</item>
     <item>http://api.bing.com/osjson.aspx?query={searchTerms}&amp;language={language}</item>
   </string-array>
+
+  <!-- Custom search engines used from overlays -->
+  <string-array name="custom_search_engine_1" translatable="false">
+  </string-array>
+  <string-array name="custom_search_engine_2" translatable="false">
+  </string-array>
+  <string-array name="custom_search_engine_3" translatable="false">
+  </string-array>
+  <string-array name="custom_search_engine_4" translatable="false">
+  </string-array>
+  <string-array name="custom_search_engine_5" translatable="false">
+  </string-array>
+  <string-array name="custom_search_engine_6" translatable="false">
+  </string-array>
+  <string-array name="custom_search_engine_7" translatable="false">
+  </string-array>
+  <string-array name="custom_search_engine_8" translatable="false">
+  </string-array>
+  <string-array name="custom_search_engine_9" translatable="false">
+  </string-array>
+  <string-array name="custom_search_engine_10" translatable="false">
+  </string-array>
+  <string-array name="custom_search_engine_11" translatable="false">
+  </string-array>
+  <string-array name="custom_search_engine_12" translatable="false">
+  </string-array>
+  <string-array name="custom_search_engine_13" translatable="false">
+  </string-array>
+  <string-array name="custom_search_engine_14" translatable="false">
+  </string-array>
+  <string-array name="custom_search_engine_15" translatable="false">
+  </string-array>
+  <string-array name="custom_search_engine_16" translatable="false">
+  </string-array>
+  <string-array name="custom_search_engine_17" translatable="false">
+  </string-array>
+  <string-array name="custom_search_engine_18" translatable="false">
+  </string-array>
+  <string-array name="custom_search_engine_19" translatable="false">
+  </string-array>
+  <string-array name="custom_search_engine_20" translatable="false">
+  </string-array>
 </resources>