From 5cd56eb88dfd662788d114804b7a72614ca92a1b Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Wed, 2 Jul 2014 16:37:43 +0200 Subject: Replicant-approved websites in the default bookmarks Signed-off-by: Paul Kocialkowski Conflicts: res/raw/thumb_google.png res/values/bookmarks_icons.xml res/values/strings.xml Change-Id: I71b07e7e8e3d50ef40d60962b7a2fe64639403fb --- res/raw/favicon_eff.ico | Bin 0 -> 1406 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_replicant.ico | Bin 0 -> 4286 bytes res/raw/thumb_eff.png | Bin 0 -> 17975 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 3796 -> 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/values/bookmarks_icons.xml | 24 ++++++++++++++++++------ res/values/strings.xml | 26 +++++++++++++++++++------- 17 files changed, 37 insertions(+), 13 deletions(-) create mode 100644 res/raw/favicon_eff.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 create mode 100644 res/raw/favicon_replicant.ico create mode 100644 res/raw/thumb_eff.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 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 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_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_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/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_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 bb93d82..0000000 Binary files a/res/raw/thumb_google.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/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 @@ - @raw/favicon_google - @raw/thumb_google - @raw/favicon_cyanogenmod - @raw/thumb_cyanogenmod - @raw/favicon_cmwiki - @raw/thumb_cmwiki + @raw/favicon_fsf + @raw/thumb_fsf + @raw/favicon_fsfe + @raw/thumb_fsfe + @raw/favicon_eff + @raw/thumb_eff + @raw/favicon_wikipedia + @raw/thumb_wikipedia + @raw/favicon_gnu + @raw/thumb_gnu + @raw/favicon_replicant + @raw/thumb_replicant_blog + @raw/favicon_replicant + @raw/thumb_replicant_wiki + @raw/favicon_replicant + @raw/thumb_replicant_tracker + @raw/favicon_replicant + @raw/thumb_replicant_forums 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 @@ - https://www.google.com/webhp?client={CID}&source=android-home + about:blank - Google - http://www.google.com - CyanogenMod - http://www.cyanogenmod.org - CyanogenMod Wiki - http://wiki.cyanogenmod.org/w/Main_Page + FSF + https://www.fsf.org/ + FSFE + https://www.fsfe.org/ + EFF + https://www.eff.org/ + Wikipedia + https://www.wikipedia.org/ + GNU + https://www.gnu.org/ + Replicant blog + https://www.replicant.us/ + Replicant wiki + https://redmine.replicant.us/projects/replicant/wiki + Replicant tracker + https://redmine.replicant.us/projects/replicant/issues + Replicant forums + https://redmine.replicant.us/projects/replicant/boards