From 72806ebcce7f31d1aaa55f5f50c4f62d7dfd99ef Mon Sep 17 00:00:00 2001
From: Paul Kocialkowski <contact@paulk.fr>
Date: Wed, 2 Jul 2014 16:37:43 +0200
Subject: Replicant-approved websites in the default bookmarks

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
---
 res/raw/favicon_amazon.ico          | Bin 17542 -> 0 bytes
 res/raw/favicon_bbc.ico             | Bin 958 -> 0 bytes
 res/raw/favicon_cnn.ico             | Bin 11502 -> 0 bytes
 res/raw/favicon_ebay.ico            | Bin 1406 -> 0 bytes
 res/raw/favicon_eff.ico             | Bin 0 -> 1406 bytes
 res/raw/favicon_espn.ico            | Bin 2862 -> 0 bytes
 res/raw/favicon_facebook.ico        | Bin 318 -> 0 bytes
 res/raw/favicon_fsf.ico             | Bin 0 -> 873 bytes
 res/raw/favicon_fsfe.ico            | Bin 0 -> 3262 bytes
 res/raw/favicon_gnu.ico             | Bin 0 -> 4286 bytes
 res/raw/favicon_google.ico          | Bin 1150 -> 0 bytes
 res/raw/favicon_msn.ico             | Bin 1150 -> 0 bytes
 res/raw/favicon_nytimes.ico         | Bin 1406 -> 0 bytes
 res/raw/favicon_picasa.ico          | Bin 1406 -> 0 bytes
 res/raw/favicon_replicant.ico       | Bin 0 -> 4286 bytes
 res/raw/favicon_twitter.ico         | Bin 1150 -> 0 bytes
 res/raw/favicon_weatherchannel.ico  | Bin 1406 -> 0 bytes
 res/raw/favicon_yahoo.ico           | Bin 318 -> 0 bytes
 res/raw/thumb_amazon.png            | Bin 17750 -> 0 bytes
 res/raw/thumb_bbc.png               | Bin 11663 -> 0 bytes
 res/raw/thumb_cnn.png               | Bin 18956 -> 0 bytes
 res/raw/thumb_ebay.png              | Bin 18526 -> 0 bytes
 res/raw/thumb_eff.png               | Bin 0 -> 17975 bytes
 res/raw/thumb_espn.png              | Bin 23367 -> 0 bytes
 res/raw/thumb_facebook.png          | Bin 10293 -> 0 bytes
 res/raw/thumb_fsf.png               | Bin 0 -> 23656 bytes
 res/raw/thumb_fsfe.png              | Bin 0 -> 27060 bytes
 res/raw/thumb_gnu.png               | Bin 0 -> 22801 bytes
 res/raw/thumb_google.png            | Bin 4754 -> 0 bytes
 res/raw/thumb_msn.png               | Bin 16154 -> 0 bytes
 res/raw/thumb_nytimes.png           | Bin 16333 -> 0 bytes
 res/raw/thumb_picasa.png            | Bin 15064 -> 0 bytes
 res/raw/thumb_replicant_blog.png    | Bin 0 -> 14283 bytes
 res/raw/thumb_replicant_forums.png  | Bin 0 -> 7139 bytes
 res/raw/thumb_replicant_tracker.png | Bin 0 -> 14251 bytes
 res/raw/thumb_replicant_wiki.png    | Bin 0 -> 12956 bytes
 res/raw/thumb_twitter.png           | Bin 13770 -> 0 bytes
 res/raw/thumb_weatherchannel.png    | Bin 21618 -> 0 bytes
 res/raw/thumb_yahoo.png             | Bin 15376 -> 0 bytes
 res/values/bookmarks_icons.xml      |  42 +++++++++++++-------------------
 res/values/strings.xml              |  46 ++++++++++++++----------------------
 41 files changed, 34 insertions(+), 54 deletions(-)
 delete mode 100644 res/raw/favicon_amazon.ico
 delete mode 100644 res/raw/favicon_bbc.ico
 delete mode 100644 res/raw/favicon_cnn.ico
 delete mode 100644 res/raw/favicon_ebay.ico
 create mode 100644 res/raw/favicon_eff.ico
 delete mode 100644 res/raw/favicon_espn.ico
 delete mode 100644 res/raw/favicon_facebook.ico
 create mode 100644 res/raw/favicon_fsf.ico
 create mode 100644 res/raw/favicon_fsfe.ico
 create mode 100644 res/raw/favicon_gnu.ico
 delete mode 100644 res/raw/favicon_google.ico
 delete mode 100644 res/raw/favicon_msn.ico
 delete mode 100644 res/raw/favicon_nytimes.ico
 delete mode 100644 res/raw/favicon_picasa.ico
 create mode 100644 res/raw/favicon_replicant.ico
 delete mode 100644 res/raw/favicon_twitter.ico
 delete mode 100644 res/raw/favicon_weatherchannel.ico
 delete mode 100644 res/raw/favicon_yahoo.ico
 delete mode 100644 res/raw/thumb_amazon.png
 delete mode 100644 res/raw/thumb_bbc.png
 delete mode 100644 res/raw/thumb_cnn.png
 delete mode 100644 res/raw/thumb_ebay.png
 create mode 100644 res/raw/thumb_eff.png
 delete mode 100644 res/raw/thumb_espn.png
 delete mode 100644 res/raw/thumb_facebook.png
 create mode 100644 res/raw/thumb_fsf.png
 create mode 100644 res/raw/thumb_fsfe.png
 create mode 100644 res/raw/thumb_gnu.png
 delete mode 100644 res/raw/thumb_google.png
 delete mode 100644 res/raw/thumb_msn.png
 delete mode 100644 res/raw/thumb_nytimes.png
 delete mode 100644 res/raw/thumb_picasa.png
 create mode 100644 res/raw/thumb_replicant_blog.png
 create mode 100644 res/raw/thumb_replicant_forums.png
 create mode 100644 res/raw/thumb_replicant_tracker.png
 create mode 100644 res/raw/thumb_replicant_wiki.png
 delete mode 100644 res/raw/thumb_twitter.png
 delete mode 100644 res/raw/thumb_weatherchannel.png
 delete mode 100644 res/raw/thumb_yahoo.png

diff --git a/res/raw/favicon_amazon.ico b/res/raw/favicon_amazon.ico
deleted file mode 100644
index 20a959c..0000000
Binary files a/res/raw/favicon_amazon.ico and /dev/null differ
diff --git a/res/raw/favicon_bbc.ico b/res/raw/favicon_bbc.ico
deleted file mode 100644
index 8f62b07..0000000
Binary files a/res/raw/favicon_bbc.ico and /dev/null differ
diff --git a/res/raw/favicon_cnn.ico b/res/raw/favicon_cnn.ico
deleted file mode 100644
index 4a8421d..0000000
Binary files a/res/raw/favicon_cnn.ico and /dev/null differ
diff --git a/res/raw/favicon_ebay.ico b/res/raw/favicon_ebay.ico
deleted file mode 100644
index d7c8a5e..0000000
Binary files a/res/raw/favicon_ebay.ico and /dev/null differ
diff --git a/res/raw/favicon_eff.ico b/res/raw/favicon_eff.ico
new file mode 100644
index 0000000..7829044
Binary files /dev/null and b/res/raw/favicon_eff.ico differ
diff --git a/res/raw/favicon_espn.ico b/res/raw/favicon_espn.ico
deleted file mode 100644
index 2dbe28a..0000000
Binary files a/res/raw/favicon_espn.ico and /dev/null differ
diff --git a/res/raw/favicon_facebook.ico b/res/raw/favicon_facebook.ico
deleted file mode 100644
index ea0c6a3..0000000
Binary files a/res/raw/favicon_facebook.ico and /dev/null differ
diff --git a/res/raw/favicon_fsf.ico b/res/raw/favicon_fsf.ico
new file mode 100644
index 0000000..1a616bd
Binary files /dev/null and b/res/raw/favicon_fsf.ico differ
diff --git a/res/raw/favicon_fsfe.ico b/res/raw/favicon_fsfe.ico
new file mode 100644
index 0000000..9127b92
Binary files /dev/null and b/res/raw/favicon_fsfe.ico differ
diff --git a/res/raw/favicon_gnu.ico b/res/raw/favicon_gnu.ico
new file mode 100644
index 0000000..dd9781f
Binary files /dev/null and b/res/raw/favicon_gnu.ico differ
diff --git a/res/raw/favicon_google.ico b/res/raw/favicon_google.ico
deleted file mode 100644
index ee7c943..0000000
Binary files a/res/raw/favicon_google.ico and /dev/null differ
diff --git a/res/raw/favicon_msn.ico b/res/raw/favicon_msn.ico
deleted file mode 100644
index b2279f5..0000000
Binary files a/res/raw/favicon_msn.ico and /dev/null differ
diff --git a/res/raw/favicon_nytimes.ico b/res/raw/favicon_nytimes.ico
deleted file mode 100644
index fb4d000..0000000
Binary files a/res/raw/favicon_nytimes.ico and /dev/null differ
diff --git a/res/raw/favicon_picasa.ico b/res/raw/favicon_picasa.ico
deleted file mode 100644
index 22133b8..0000000
Binary files a/res/raw/favicon_picasa.ico and /dev/null differ
diff --git a/res/raw/favicon_replicant.ico b/res/raw/favicon_replicant.ico
new file mode 100644
index 0000000..465873c
Binary files /dev/null and b/res/raw/favicon_replicant.ico differ
diff --git a/res/raw/favicon_twitter.ico b/res/raw/favicon_twitter.ico
deleted file mode 100644
index 00450d4..0000000
Binary files a/res/raw/favicon_twitter.ico and /dev/null differ
diff --git a/res/raw/favicon_weatherchannel.ico b/res/raw/favicon_weatherchannel.ico
deleted file mode 100644
index 5a56818..0000000
Binary files a/res/raw/favicon_weatherchannel.ico and /dev/null differ
diff --git a/res/raw/favicon_yahoo.ico b/res/raw/favicon_yahoo.ico
deleted file mode 100644
index d7761e5..0000000
Binary files a/res/raw/favicon_yahoo.ico and /dev/null differ
diff --git a/res/raw/thumb_amazon.png b/res/raw/thumb_amazon.png
deleted file mode 100644
index 4dd2f35..0000000
Binary files a/res/raw/thumb_amazon.png and /dev/null differ
diff --git a/res/raw/thumb_bbc.png b/res/raw/thumb_bbc.png
deleted file mode 100644
index dff0424..0000000
Binary files a/res/raw/thumb_bbc.png and /dev/null differ
diff --git a/res/raw/thumb_cnn.png b/res/raw/thumb_cnn.png
deleted file mode 100644
index 3d6fdc9..0000000
Binary files a/res/raw/thumb_cnn.png and /dev/null differ
diff --git a/res/raw/thumb_ebay.png b/res/raw/thumb_ebay.png
deleted file mode 100644
index 023f678..0000000
Binary files a/res/raw/thumb_ebay.png and /dev/null differ
diff --git a/res/raw/thumb_eff.png b/res/raw/thumb_eff.png
new file mode 100644
index 0000000..82a7dcf
Binary files /dev/null and b/res/raw/thumb_eff.png differ
diff --git a/res/raw/thumb_espn.png b/res/raw/thumb_espn.png
deleted file mode 100644
index c0882eb..0000000
Binary files a/res/raw/thumb_espn.png and /dev/null differ
diff --git a/res/raw/thumb_facebook.png b/res/raw/thumb_facebook.png
deleted file mode 100644
index a8c047f..0000000
Binary files a/res/raw/thumb_facebook.png and /dev/null differ
diff --git a/res/raw/thumb_fsf.png b/res/raw/thumb_fsf.png
new file mode 100644
index 0000000..befa2f4
Binary files /dev/null and b/res/raw/thumb_fsf.png differ
diff --git a/res/raw/thumb_fsfe.png b/res/raw/thumb_fsfe.png
new file mode 100644
index 0000000..7d97cef
Binary files /dev/null and b/res/raw/thumb_fsfe.png differ
diff --git a/res/raw/thumb_gnu.png b/res/raw/thumb_gnu.png
new file mode 100644
index 0000000..047b3d0
Binary files /dev/null and b/res/raw/thumb_gnu.png differ
diff --git a/res/raw/thumb_google.png b/res/raw/thumb_google.png
deleted file mode 100644
index c54e6ea..0000000
Binary files a/res/raw/thumb_google.png and /dev/null differ
diff --git a/res/raw/thumb_msn.png b/res/raw/thumb_msn.png
deleted file mode 100644
index 4ad710f..0000000
Binary files a/res/raw/thumb_msn.png and /dev/null differ
diff --git a/res/raw/thumb_nytimes.png b/res/raw/thumb_nytimes.png
deleted file mode 100644
index d6849c3..0000000
Binary files a/res/raw/thumb_nytimes.png and /dev/null differ
diff --git a/res/raw/thumb_picasa.png b/res/raw/thumb_picasa.png
deleted file mode 100644
index 5ec2d7a..0000000
Binary files a/res/raw/thumb_picasa.png and /dev/null differ
diff --git a/res/raw/thumb_replicant_blog.png b/res/raw/thumb_replicant_blog.png
new file mode 100644
index 0000000..6254c96
Binary files /dev/null and b/res/raw/thumb_replicant_blog.png differ
diff --git a/res/raw/thumb_replicant_forums.png b/res/raw/thumb_replicant_forums.png
new file mode 100644
index 0000000..1ee1196
Binary files /dev/null and b/res/raw/thumb_replicant_forums.png differ
diff --git a/res/raw/thumb_replicant_tracker.png b/res/raw/thumb_replicant_tracker.png
new file mode 100644
index 0000000..07527c8
Binary files /dev/null and b/res/raw/thumb_replicant_tracker.png differ
diff --git a/res/raw/thumb_replicant_wiki.png b/res/raw/thumb_replicant_wiki.png
new file mode 100644
index 0000000..45d679e
Binary files /dev/null and b/res/raw/thumb_replicant_wiki.png differ
diff --git a/res/raw/thumb_twitter.png b/res/raw/thumb_twitter.png
deleted file mode 100644
index 95e247f..0000000
Binary files a/res/raw/thumb_twitter.png and /dev/null differ
diff --git a/res/raw/thumb_weatherchannel.png b/res/raw/thumb_weatherchannel.png
deleted file mode 100644
index a190a0c..0000000
Binary files a/res/raw/thumb_weatherchannel.png and /dev/null differ
diff --git a/res/raw/thumb_yahoo.png b/res/raw/thumb_yahoo.png
deleted file mode 100644
index 08dd759..0000000
Binary files a/res/raw/thumb_yahoo.png and /dev/null differ
diff --git a/res/values/bookmarks_icons.xml b/res/values/bookmarks_icons.xml
index 5d8e85a..c6dd6d2 100644
--- a/res/values/bookmarks_icons.xml
+++ b/res/values/bookmarks_icons.xml
@@ -1,33 +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_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_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_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>
+        <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 8121e5c..29069c4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -797,38 +797,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>Picasa</item>
-        <item>http://picasaweb.google.com/</item>
-        <item>Yahoo!</item>
-        <item>http://www.yahoo.com/</item>
-        <item>MSN</item>
-        <item>http://www.msn.com/</item>
-        <item>Twitter</item>
-        <item>http://twitter.com/</item>
-        <item>Facebook</item>
-        <item>http://www.facebook.com/</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>http://www.wikipedia.org/</item>
-        <item>eBay</item>
-        <item>http://www.ebay.com/</item>
-        <item>CNN</item>
-        <item>http://www.cnn.com/</item>
-        <item>NY Times</item>
-        <item>http://www.nytimes.com/</item>
-        <item>ESPN</item>
-        <item>http://espn.com/</item>
-        <item>Amazon</item>
-        <item>http://www.amazon.com/</item>
-        <item>Weather Channel</item>
-        <item>http://www.weather.com/</item>
-        <item>BBC</item>
-        <item>http://www.bbc.co.uk/</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>
 
     <!-- Bookmark name for Picasa website -->
-- 
cgit v1.1