Replicant-approved websites in the default bookmarks

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>

Conflicts:
	res/raw/thumb_google.png
	res/values/bookmarks_icons.xml
	res/values/strings.xml

Change-Id: I71b07e7e8e3d50ef40d60962b7a2fe64639403fb

17 files changed, 37 insertions, 13 deletions

diff --git a/res/raw/favicon_eff.ico b/res/raw/favicon_eff.ico
new file mode 100644
index 000000000..782904422
--- /dev/null
+++ b/res/raw/favicon_eff.ico
diff --git a/res/raw/favicon_fsf.ico b/res/raw/favicon_fsf.ico
new file mode 100644
index 000000000..1a616bdcb
--- /dev/null
+++ b/res/raw/favicon_fsf.ico
diff --git a/res/raw/favicon_fsfe.ico b/res/raw/favicon_fsfe.ico
new file mode 100644
index 000000000..9127b9233
--- /dev/null
+++ b/res/raw/favicon_fsfe.ico
diff --git a/res/raw/favicon_gnu.ico b/res/raw/favicon_gnu.ico
new file mode 100644
index 000000000..dd9781f86
--- /dev/null
+++ b/res/raw/favicon_gnu.ico
diff --git a/res/raw/favicon_google.ico b/res/raw/favicon_google.ico
deleted file mode 100644
index ee7c943ab..000000000
--- a/res/raw/favicon_google.ico
+++ /dev/null
diff --git a/res/raw/favicon_replicant.ico b/res/raw/favicon_replicant.ico
new file mode 100644
index 000000000..465873c25
--- /dev/null
+++ b/res/raw/favicon_replicant.ico
diff --git a/res/raw/thumb_eff.png b/res/raw/thumb_eff.png
new file mode 100644
index 000000000..82a7dcf8e
--- /dev/null
+++ b/res/raw/thumb_eff.png
diff --git a/res/raw/thumb_fsf.png b/res/raw/thumb_fsf.png
new file mode 100644
index 000000000..befa2f4f4
--- /dev/null
+++ b/res/raw/thumb_fsf.png
diff --git a/res/raw/thumb_fsfe.png b/res/raw/thumb_fsfe.png
new file mode 100644
index 000000000..7d97cef2e
--- /dev/null
+++ b/res/raw/thumb_fsfe.png
diff --git a/res/raw/thumb_gnu.png b/res/raw/thumb_gnu.png
new file mode 100644
index 000000000..047b3d098
--- /dev/null
+++ b/res/raw/thumb_gnu.png
diff --git a/res/raw/thumb_google.png b/res/raw/thumb_google.png
deleted file mode 100644
index bb93d82fe..000000000
--- a/res/raw/thumb_google.png
+++ /dev/null
diff --git a/res/raw/thumb_replicant_blog.png b/res/raw/thumb_replicant_blog.png
new file mode 100644
index 000000000..6254c96e4
--- /dev/null
+++ b/res/raw/thumb_replicant_blog.png
diff --git a/res/raw/thumb_replicant_forums.png b/res/raw/thumb_replicant_forums.png
new file mode 100644
index 000000000..1ee1196a9
--- /dev/null
+++ b/res/raw/thumb_replicant_forums.png
diff --git a/res/raw/thumb_replicant_tracker.png b/res/raw/thumb_replicant_tracker.png
new file mode 100644
index 000000000..07527c86d
--- /dev/null
+++ b/res/raw/thumb_replicant_tracker.png
diff --git a/res/raw/thumb_replicant_wiki.png b/res/raw/thumb_replicant_wiki.png
new file mode 100644
index 000000000..45d679ef3
--- /dev/null
+++ b/res/raw/thumb_replicant_wiki.png
diff --git a/res/values/bookmarks_icons.xml b/res/values/bookmarks_icons.xml
index 50d7eaf60..c6dd6d204 100644
--- a/res/values/bookmarks_icons.xml
+++ b/res/values/bookmarks_icons.xml
@@ -1,11 +1,23 @@
 <?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_cyanogenmod</item>
-        <item>@raw/thumb_cyanogenmod</item>
-        <item>@raw/favicon_cmwiki</item>
-        <item>@raw/thumb_cmwiki</item>
+        <item>@raw/favicon_fsf</item>
+        <item>@raw/thumb_fsf</item>
+        <item>@raw/favicon_fsfe</item>
+        <item>@raw/thumb_fsfe</item>
+        <item>@raw/favicon_eff</item>
+        <item>@raw/thumb_eff</item>
+        <item>@raw/favicon_wikipedia</item>
+        <item>@raw/thumb_wikipedia</item>
+        <item>@raw/favicon_gnu</item>
+        <item>@raw/thumb_gnu</item>
+        <item>@raw/favicon_replicant</item>
+        <item>@raw/thumb_replicant_blog</item>
+        <item>@raw/favicon_replicant</item>
+        <item>@raw/thumb_replicant_wiki</item>
+        <item>@raw/favicon_replicant</item>
+        <item>@raw/thumb_replicant_tracker</item>
+        <item>@raw/favicon_replicant</item>
+        <item>@raw/thumb_replicant_forums</item>
     </array>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f5d3d262f..752b04235 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -799,16 +799,28 @@
 
     <!-- The default homepage. -->
     <string name="homepage_base" translatable="false">
-        https://www.google.com/webhp?client={CID}&amp;source=android-home</string>
+        about:blank</string>
 
     <!-- Bookmarks -->
     <string-array name="bookmarks" translatable="false">
-        <item>Google</item>
-        <item>http://www.google.com</item>
-        <item>CyanogenMod</item>
-        <item>http://www.cyanogenmod.org</item>
-        <item>CyanogenMod Wiki</item>
-        <item>http://wiki.cyanogenmod.org/w/Main_Page</item>
+        <item>FSF</item>
+        <item>https://www.fsf.org/</item>
+        <item>FSFE</item>
+        <item>https://www.fsfe.org/</item>
+        <item>EFF</item>
+        <item>https://www.eff.org/</item>
+        <item>Wikipedia</item>
+        <item>https://www.wikipedia.org/</item>
+        <item>GNU</item>
+        <item>https://www.gnu.org/</item>
+        <item>Replicant blog</item>
+        <item>https://www.replicant.us/</item>
+        <item>Replicant wiki</item>
+        <item>https://redmine.replicant.us/projects/replicant/wiki</item>
+        <item>Replicant tracker</item>
+        <item>https://redmine.replicant.us/projects/replicant/issues</item>
+        <item>Replicant forums</item>
+        <item>https://redmine.replicant.us/projects/replicant/boards</item>
     </string-array>
 
     <!-- The description of the suggestion that lets the user search the web for the query currently