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
diff --git a/res/raw/bookmark.png b/res/raw/bookmark.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/bookmark.png
diff --git a/res/raw/custom_bookmark_favicon_1.png b/res/raw/custom_bookmark_favicon_1.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_favicon_1.png
diff --git a/res/raw/custom_bookmark_favicon_10.png b/res/raw/custom_bookmark_favicon_10.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_favicon_10.png
diff --git a/res/raw/custom_bookmark_favicon_11.png b/res/raw/custom_bookmark_favicon_11.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_favicon_11.png
diff --git a/res/raw/custom_bookmark_favicon_12.png b/res/raw/custom_bookmark_favicon_12.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_favicon_12.png
diff --git a/res/raw/custom_bookmark_favicon_13.png b/res/raw/custom_bookmark_favicon_13.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_favicon_13.png
diff --git a/res/raw/custom_bookmark_favicon_14.png b/res/raw/custom_bookmark_favicon_14.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_favicon_14.png
diff --git a/res/raw/custom_bookmark_favicon_15.png b/res/raw/custom_bookmark_favicon_15.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_favicon_15.png
diff --git a/res/raw/custom_bookmark_favicon_16.png b/res/raw/custom_bookmark_favicon_16.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_favicon_16.png
diff --git a/res/raw/custom_bookmark_favicon_17.png b/res/raw/custom_bookmark_favicon_17.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_favicon_17.png
diff --git a/res/raw/custom_bookmark_favicon_18.png b/res/raw/custom_bookmark_favicon_18.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_favicon_18.png
diff --git a/res/raw/custom_bookmark_favicon_19.png b/res/raw/custom_bookmark_favicon_19.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_favicon_19.png
diff --git a/res/raw/custom_bookmark_favicon_2.ico b/res/raw/custom_bookmark_favicon_2.ico
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_favicon_2.ico
diff --git a/res/raw/custom_bookmark_favicon_20.png b/res/raw/custom_bookmark_favicon_20.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_favicon_20.png
diff --git a/res/raw/custom_bookmark_favicon_3.png b/res/raw/custom_bookmark_favicon_3.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_favicon_3.png
diff --git a/res/raw/custom_bookmark_favicon_4.ico b/res/raw/custom_bookmark_favicon_4.ico
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_favicon_4.ico
diff --git a/res/raw/custom_bookmark_favicon_5.png b/res/raw/custom_bookmark_favicon_5.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_favicon_5.png
diff --git a/res/raw/custom_bookmark_favicon_6.ico b/res/raw/custom_bookmark_favicon_6.ico
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_favicon_6.ico
diff --git a/res/raw/custom_bookmark_favicon_7.png b/res/raw/custom_bookmark_favicon_7.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_favicon_7.png
diff --git a/res/raw/custom_bookmark_favicon_8.png b/res/raw/custom_bookmark_favicon_8.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_favicon_8.png
diff --git a/res/raw/custom_bookmark_favicon_9.png b/res/raw/custom_bookmark_favicon_9.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_favicon_9.png
diff --git a/res/raw/custom_bookmark_thumb_1.png b/res/raw/custom_bookmark_thumb_1.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_thumb_1.png
diff --git a/res/raw/custom_bookmark_thumb_10.png b/res/raw/custom_bookmark_thumb_10.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_thumb_10.png
diff --git a/res/raw/custom_bookmark_thumb_11.png b/res/raw/custom_bookmark_thumb_11.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_thumb_11.png
diff --git a/res/raw/custom_bookmark_thumb_12.png b/res/raw/custom_bookmark_thumb_12.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_thumb_12.png
diff --git a/res/raw/custom_bookmark_thumb_13.png b/res/raw/custom_bookmark_thumb_13.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_thumb_13.png
diff --git a/res/raw/custom_bookmark_thumb_14.png b/res/raw/custom_bookmark_thumb_14.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_thumb_14.png
diff --git a/res/raw/custom_bookmark_thumb_15.png b/res/raw/custom_bookmark_thumb_15.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_thumb_15.png
diff --git a/res/raw/custom_bookmark_thumb_16.png b/res/raw/custom_bookmark_thumb_16.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_thumb_16.png
diff --git a/res/raw/custom_bookmark_thumb_17.png b/res/raw/custom_bookmark_thumb_17.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_thumb_17.png
diff --git a/res/raw/custom_bookmark_thumb_18.png b/res/raw/custom_bookmark_thumb_18.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_thumb_18.png
diff --git a/res/raw/custom_bookmark_thumb_19.png b/res/raw/custom_bookmark_thumb_19.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_thumb_19.png
diff --git a/res/raw/custom_bookmark_thumb_2.png b/res/raw/custom_bookmark_thumb_2.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_thumb_2.png
diff --git a/res/raw/custom_bookmark_thumb_20.png b/res/raw/custom_bookmark_thumb_20.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_thumb_20.png
diff --git a/res/raw/custom_bookmark_thumb_3.png b/res/raw/custom_bookmark_thumb_3.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_thumb_3.png
diff --git a/res/raw/custom_bookmark_thumb_4.png b/res/raw/custom_bookmark_thumb_4.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_thumb_4.png
diff --git a/res/raw/custom_bookmark_thumb_5.png b/res/raw/custom_bookmark_thumb_5.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_thumb_5.png
diff --git a/res/raw/custom_bookmark_thumb_6.png b/res/raw/custom_bookmark_thumb_6.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_thumb_6.png
diff --git a/res/raw/custom_bookmark_thumb_7.png b/res/raw/custom_bookmark_thumb_7.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_thumb_7.png
diff --git a/res/raw/custom_bookmark_thumb_8.png b/res/raw/custom_bookmark_thumb_8.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_thumb_8.png
diff --git a/res/raw/custom_bookmark_thumb_9.png b/res/raw/custom_bookmark_thumb_9.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/custom_bookmark_thumb_9.png
diff --git a/res/raw/default_page.html b/res/raw/default_page.html
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/default_page.html
diff --git a/res/raw/history.png b/res/raw/history.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/history.png
diff --git a/res/values-zh-rCN/donottranslate-search_engines.xml b/res/values-zh-rCN/donottranslate-search_engines.xml
index b85a2b5..5a3c0c6 100644
--- a/res/values-zh-rCN/donottranslate-search_engines.xml
+++ b/res/values-zh-rCN/donottranslate-search_engines.xml
@@ -24,7 +24,6 @@
<string-array name="search_engines" translatable="false">
<item>google</item>
<item>baidu_cn</item>
- <item>cmcc_cn</item>
<item>yahoo_cn</item>
<item>bing_zh_CN</item>
</string-array>
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}&language={language}</item>
</string-array>
- <string-array name="cmcc_cn" translatable="false">
- <item>移动搜索</item>
- <item>s.139.com</item>
- <item>http://s.139.com/favicon.ico</item>
- <item>http://s.139.com/search.do?q={searchTerms}&category=downloadable|web|browseable&tid=2123,2124,2125,2126&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}&category=downloadable|web|browseable&tid=2123,2124,2125,2126&fr=portalcustom2</item>
- <item>UTF-8</item>
- <item></item>
- </string-array>
<string-array name="yahoo_cn" translatable="false">
<item>中国雅虎</item>
<item>cn.yahoo.com</item>
@@ -773,5 +756,47 @@
<item>UTF-8</item>
<item>http://api.bing.com/osjson.aspx?query={searchTerms}&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>
diff --git a/res/values/bookmarks_icons.xml b/res/values/bookmarks_icons.xml
index 5d8e85a..8bb982c 100644
--- a/res/values/bookmarks_icons.xml
+++ b/res/values/bookmarks_icons.xml
@@ -1,33 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <array name="bookmark_preloads">
- <item>@raw/favicon_google</item>
- <item>@raw/thumb_google</item>
- <item>@raw/favicon_picasa</item>
- <item>@raw/thumb_picasa</item>
- <item>@raw/favicon_yahoo</item>
- <item>@raw/thumb_yahoo</item>
- <item>@raw/favicon_msn</item>
- <item>@raw/thumb_msn</item>
- <item>@raw/favicon_twitter</item>
- <item>@raw/thumb_twitter</item>
- <item>@raw/favicon_facebook</item>
- <item>@raw/thumb_facebook</item>
- <item>@raw/favicon_wikipedia</item>
- <item>@raw/thumb_wikipedia</item>
- <item>@raw/favicon_ebay</item>
- <item>@raw/thumb_ebay</item>
- <item>@raw/favicon_cnn</item>
- <item>@raw/thumb_cnn</item>
- <item>@raw/favicon_nytimes</item>
- <item>@raw/thumb_nytimes</item>
- <item>@raw/favicon_espn</item>
- <item>@raw/thumb_espn</item>
- <item>@raw/favicon_amazon</item>
- <item>@raw/thumb_amazon</item>
- <item>@raw/favicon_weatherchannel</item>
- <item>@raw/thumb_weatherchannel</item>
- <item>@raw/favicon_bbc</item>
- <item>@raw/thumb_bbc</item>
- </array>
+ <string-array name="bookmark_preloads">
+ <item>favicon_google</item>
+ <item>thumb_google</item>
+ <item>favicon_picasa</item>
+ <item>thumb_picasa</item>
+ <item>favicon_yahoo</item>
+ <item>thumb_yahoo</item>
+ <item>favicon_msn</item>
+ <item>thumb_msn</item>
+ <item>favicon_twitter</item>
+ <item>thumb_twitter</item>
+ <item>favicon_facebook</item>
+ <item>thumb_facebook</item>
+ <item>favicon_wikipedia</item>
+ <item>thumb_wikipedia</item>
+ <item>favicon_ebay</item>
+ <item>thumb_ebay</item>
+ <item>favicon_cnn</item>
+ <item>thumb_cnn</item>
+ <item>favicon_nytimes</item>
+ <item>thumb_nytimes</item>
+ <item>favicon_espn</item>
+ <item>thumb_espn</item>
+ <item>favicon_amazon</item>
+ <item>thumb_amazon</item>
+ <item>favicon_weatherchannel</item>
+ <item>thumb_weatherchannel</item>
+ <item>favicon_bbc</item>
+ <item>thumb_bbc</item>
+ </string-array>
</resources>
diff --git a/res/values/bools.xml b/res/values/bools.xml
index cc8ff5a..9ff3010 100644
--- a/res/values/bools.xml
+++ b/res/values/bools.xml
@@ -19,4 +19,9 @@
<!-- Browser menu toggles -->
<bool name="menu_show_navigation">true</bool>
<bool name="menu_show_bookmarks">true</bool>
+ <!-- Carrier Specific Values -->
+ <bool name="wap2estore">false</bool>
+ <bool name="drm_uploads">false</bool>
+ <bool name="network_notifier">false</bool>
+ <bool name="def_disable_history">false</bool>
</resources>
diff --git a/res/values/donottranslate-search_engines.xml b/res/values/donottranslate-search_engines.xml
index 081efc0..f83526b 100644
--- a/res/values/donottranslate-search_engines.xml
+++ b/res/values/donottranslate-search_engines.xml
@@ -24,7 +24,6 @@
<string-array name="search_engines" translatable="false">
<item>google</item>
<item>baidu</item>
- <item>cmcc</item>
<item>yahoo</item>
<item>bing</item>
</string-array>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e4718bf..4c8033f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -797,6 +797,12 @@
<!-- Do not translate. Testing only -->
<string name="dump_nav" translatable="false">Dump navigation cache</string>
+ <!-- Intentional empty elements - used for overlay feature -->
+ <string name="def_wifi_browser_interaction_remind_type"></string>
+ <string name="def_action_wifi_selection_data_connections"></string>
+ <string name="def_landing_page"></string>
+ <string name="def_useragent"></string>
+
<!-- The default homepage. -->
<string name="homepage_base" translatable="false">
https://www.google.com/webhp?client={CID}&source=android-home</string>
