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

1 files changed, 3 insertions, 11 deletions

diff --git a/src/com/android/browser/search/SearchEngines.java b/src/com/android/browser/search/SearchEngines.java
index 91bddc8e..64497c36 100644
--- a/src/com/android/browser/search/SearchEngines.java
+++ b/src/com/android/browser/search/SearchEngines.java
@@ -35,19 +35,11 @@ public class SearchEngines {
 
     public static List<SearchEngineInfo> getSearchEngineInfos(Context context) {
         ArrayList<SearchEngineInfo> searchEngineInfos = new ArrayList<SearchEngineInfo>();
-        Resources res = context.getResources();
-        String[] searchEngines = res.getStringArray(R.array.search_engines);
-        // add for carrier feature - preset search engine
-        String browserRes = res.getString(R.string.config_carrier_resource);
+        String[] searchEngines = context.getResources().getStringArray(R.array.search_engines);
         for (int i = 0; i < searchEngines.length; i++) {
             String name = searchEngines[i];
-            if ("cmcc".equals(browserRes)) {
-                SearchEngineInfo info = new SearchEngineInfo(context, name);
-                searchEngineInfos.add(info);
-            } else if (!name.startsWith("cmcc")) {
-                SearchEngineInfo info = new SearchEngineInfo(context, name);
-                searchEngineInfos.add(info);
-            }
+            SearchEngineInfo info = new SearchEngineInfo(context, name);
+            searchEngineInfos.add(info);
         }
         return searchEngineInfos;
     }