summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kocialkowski <contact@paulk.fr>2014-07-02 16:37:43 +0200
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-12-30 10:43:19 +0100
commit5cd56eb88dfd662788d114804b7a72614ca92a1b (patch)
tree9554c5cb63f3992b5d8c3c18a8aad58095024fa7
parentf0c9e49de5996255566a10690fe065daf9101aaf (diff)
downloadpackages_apps_Browser-5cd56eb88dfd662788d114804b7a72614ca92a1b.zip
packages_apps_Browser-5cd56eb88dfd662788d114804b7a72614ca92a1b.tar.gz
packages_apps_Browser-5cd56eb88dfd662788d114804b7a72614ca92a1b.tar.bz2
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
-rw-r--r--res/raw/favicon_eff.icobin0 -> 1406 bytes
-rw-r--r--res/raw/favicon_fsf.icobin0 -> 873 bytes
-rw-r--r--res/raw/favicon_fsfe.icobin0 -> 3262 bytes
-rw-r--r--res/raw/favicon_gnu.icobin0 -> 4286 bytes
-rw-r--r--res/raw/favicon_google.icobin1150 -> 0 bytes
-rw-r--r--res/raw/favicon_replicant.icobin0 -> 4286 bytes
-rw-r--r--res/raw/thumb_eff.pngbin0 -> 17975 bytes
-rw-r--r--res/raw/thumb_fsf.pngbin0 -> 23656 bytes
-rw-r--r--res/raw/thumb_fsfe.pngbin0 -> 27060 bytes
-rw-r--r--res/raw/thumb_gnu.pngbin0 -> 22801 bytes
-rw-r--r--res/raw/thumb_google.pngbin3796 -> 0 bytes
-rw-r--r--res/raw/thumb_replicant_blog.pngbin0 -> 14283 bytes
-rw-r--r--res/raw/thumb_replicant_forums.pngbin0 -> 7139 bytes
-rw-r--r--res/raw/thumb_replicant_tracker.pngbin0 -> 14251 bytes
-rw-r--r--res/raw/thumb_replicant_wiki.pngbin0 -> 12956 bytes
-rw-r--r--res/values/bookmarks_icons.xml24
-rw-r--r--res/values/strings.xml26
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 0000000..7829044
--- /dev/null
+++ b/res/raw/favicon_eff.ico
Binary files differ
diff --git a/res/raw/favicon_fsf.ico b/res/raw/favicon_fsf.ico
new file mode 100644
index 0000000..1a616bd
--- /dev/null
+++ b/res/raw/favicon_fsf.ico
Binary files differ
diff --git a/res/raw/favicon_fsfe.ico b/res/raw/favicon_fsfe.ico
new file mode 100644
index 0000000..9127b92
--- /dev/null
+++ b/res/raw/favicon_fsfe.ico
Binary files differ
diff --git a/res/raw/favicon_gnu.ico b/res/raw/favicon_gnu.ico
new file mode 100644
index 0000000..dd9781f
--- /dev/null
+++ b/res/raw/favicon_gnu.ico
Binary files differ
diff --git a/res/raw/favicon_google.ico b/res/raw/favicon_google.ico
deleted file mode 100644
index ee7c943..0000000
--- a/res/raw/favicon_google.ico
+++ /dev/null
Binary files differ
diff --git a/res/raw/favicon_replicant.ico b/res/raw/favicon_replicant.ico
new file mode 100644
index 0000000..465873c
--- /dev/null
+++ b/res/raw/favicon_replicant.ico
Binary files differ
diff --git a/res/raw/thumb_eff.png b/res/raw/thumb_eff.png
new file mode 100644
index 0000000..82a7dcf
--- /dev/null
+++ b/res/raw/thumb_eff.png
Binary files differ
diff --git a/res/raw/thumb_fsf.png b/res/raw/thumb_fsf.png
new file mode 100644
index 0000000..befa2f4
--- /dev/null
+++ b/res/raw/thumb_fsf.png
Binary files differ
diff --git a/res/raw/thumb_fsfe.png b/res/raw/thumb_fsfe.png
new file mode 100644
index 0000000..7d97cef
--- /dev/null
+++ b/res/raw/thumb_fsfe.png
Binary files differ
diff --git a/res/raw/thumb_gnu.png b/res/raw/thumb_gnu.png
new file mode 100644
index 0000000..047b3d0
--- /dev/null
+++ b/res/raw/thumb_gnu.png
Binary files differ
diff --git a/res/raw/thumb_google.png b/res/raw/thumb_google.png
deleted file mode 100644
index bb93d82..0000000
--- a/res/raw/thumb_google.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/thumb_replicant_blog.png b/res/raw/thumb_replicant_blog.png
new file mode 100644
index 0000000..6254c96
--- /dev/null
+++ b/res/raw/thumb_replicant_blog.png
Binary files differ
diff --git a/res/raw/thumb_replicant_forums.png b/res/raw/thumb_replicant_forums.png
new file mode 100644
index 0000000..1ee1196
--- /dev/null
+++ b/res/raw/thumb_replicant_forums.png
Binary files differ
diff --git a/res/raw/thumb_replicant_tracker.png b/res/raw/thumb_replicant_tracker.png
new file mode 100644
index 0000000..07527c8
--- /dev/null
+++ b/res/raw/thumb_replicant_tracker.png
Binary files differ
diff --git a/res/raw/thumb_replicant_wiki.png b/res/raw/thumb_replicant_wiki.png
new file mode 100644
index 0000000..45d679e
--- /dev/null
+++ b/res/raw/thumb_replicant_wiki.png
Binary files differ
diff --git a/res/values/bookmarks_icons.xml b/res/values/bookmarks_icons.xml
index 50d7eaf..c6dd6d2 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 f5d3d26..752b042 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