summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlinuxx <joey@cyanogenmoditalia.it>2015-02-20 21:39:18 +0100
committerSteve Kondik <steve@cyngn.com>2015-11-07 13:57:35 -0800
commitcfc55f1967f309ab077eded9aa6afa542cd4f00a (patch)
tree08530a0a83c3803a403c2b5b1b7245a890afe801
parent2fb3acbe27418b0d419227a87d75fbf8bdc8f9a1 (diff)
downloadpackages_apps_Browser-cfc55f1967f309ab077eded9aa6afa542cd4f00a.tar.gz
packages_apps_Browser-cfc55f1967f309ab077eded9aa6afa542cd4f00a.tar.bz2
packages_apps_Browser-cfc55f1967f309ab077eded9aa6afa542cd4f00a.zip
Browser: UI updates
-Vectors -New favourites (google, cyanogenmod, cyanogenmod wiki) Change-Id: I2c91f78192139e281618010722e678c0babcf46d Signed-off-by: linuxx <joey@cyanogenmoditalia.it>
-rw-r--r--res/drawable-hdpi/ic_add_string.pngbin276 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_back_dark.pngbin287 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_back_disabled_dark.pngbin287 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_bookmarks_dark.pngbin330 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_bookmarks_history_dark.pngbin330 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_close_window_dark.pngbin324 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_forward_dark.pngbin280 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_forward_disabled_dark.pngbin280 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_menu_overflow.pngbin219 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_new_window_dark.pngbin223 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_stop_dark.pngbin324 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_add_string.pngbin134 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_back_dark.pngbin240 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_back_disabled_dark.pngbin240 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_bookmarks_dark.pngbin262 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_bookmarks_history_dark.pngbin262 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_close_window_dark.pngbin279 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_forward_dark.pngbin229 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_forward_disabled_dark.pngbin229 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_menu_overflow.pngbin202 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_new_window_dark.pngbin174 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_stop_dark.pngbin279 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_add_string.pngbin816 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_back_dark.pngbin336 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_back_disabled_dark.pngbin336 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_bookmarks_dark.pngbin401 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_bookmarks_history_dark.pngbin401 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_close_window_dark.pngbin402 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_forward_dark.pngbin317 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_forward_disabled_dark.pngbin317 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_menu_overflow.pngbin269 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_new_window_dark.pngbin198 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_stop_dark.pngbin492 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_add_string.pngbin816 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_back_dark.pngbin410 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_back_disabled_dark.pngbin410 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_bookmarks_dark.pngbin430 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_bookmarks_history_dark.pngbin430 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_close_window_dark.pngbin492 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_forward_dark.pngbin317 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_forward_disabled_dark.pngbin317 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_menu_overflow.pngbin281 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_new_window_dark.pngbin734 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_stop_dark.pngbin492 -> 0 bytes
-rw-r--r--res/drawable/app_web_browser_sm.xml19
-rw-r--r--res/drawable/ic_add_string.xml15
-rw-r--r--res/drawable/ic_back_dark.xml15
-rw-r--r--res/drawable/ic_back_disabled_dark.xml15
-rw-r--r--res/drawable/ic_back_hierarchy_dark.xml15
-rw-r--r--res/drawable/ic_bookmarks_dark.xml16
-rw-r--r--res/drawable/ic_bookmarks_history_dark.xml16
-rw-r--r--res/drawable/ic_close_window_dark.xml16
-rw-r--r--res/drawable/ic_forward_dark.xml15
-rw-r--r--res/drawable/ic_forward_disabled_dark.xml15
-rw-r--r--res/drawable/ic_menu_overflow.xml16
-rw-r--r--res/drawable/ic_new_window_dark.xml15
-rw-r--r--res/drawable/ic_refresh_dark.xml17
-rw-r--r--res/drawable/ic_stop_dark.xml16
-rw-r--r--res/drawable/ic_tab_close.xml17
-rw-r--r--res/raw/favicon_amazon.icobin17542 -> 0 bytes
-rw-r--r--res/raw/favicon_bbc.icobin958 -> 0 bytes
-rw-r--r--res/raw/favicon_cmwiki.icobin0 -> 318 bytes
-rw-r--r--res/raw/favicon_cnn.icobin11502 -> 0 bytes
-rw-r--r--res/raw/favicon_cyanogenmod.icobin0 -> 1150 bytes
-rw-r--r--res/raw/favicon_ebay.icobin1406 -> 0 bytes
-rw-r--r--res/raw/favicon_espn.icobin2862 -> 0 bytes
-rw-r--r--res/raw/favicon_facebook.icobin318 -> 0 bytes
-rw-r--r--res/raw/favicon_msn.icobin1150 -> 0 bytes
-rw-r--r--res/raw/favicon_nytimes.icobin1406 -> 0 bytes
-rw-r--r--res/raw/favicon_picasa.icobin1406 -> 0 bytes
-rw-r--r--res/raw/favicon_twitter.icobin1150 -> 0 bytes
-rw-r--r--res/raw/favicon_weatherchannel.icobin1406 -> 0 bytes
-rw-r--r--res/raw/favicon_wikipedia.icobin318 -> 0 bytes
-rw-r--r--res/raw/favicon_yahoo.icobin318 -> 0 bytes
-rw-r--r--res/raw/thumb_amazon.pngbin17750 -> 0 bytes
-rw-r--r--res/raw/thumb_bbc.pngbin11663 -> 0 bytes
-rw-r--r--res/raw/thumb_cmwiki.pngbin0 -> 7006 bytes
-rw-r--r--res/raw/thumb_cnn.pngbin18956 -> 0 bytes
-rw-r--r--res/raw/thumb_cyanogenmod.pngbin0 -> 5994 bytes
-rw-r--r--res/raw/thumb_ebay.pngbin18526 -> 0 bytes
-rw-r--r--res/raw/thumb_espn.pngbin23367 -> 0 bytes
-rw-r--r--res/raw/thumb_facebook.pngbin10293 -> 0 bytes
-rw-r--r--res/raw/thumb_google.pngbin4754 -> 3796 bytes
-rw-r--r--res/raw/thumb_msn.pngbin16154 -> 0 bytes
-rw-r--r--res/raw/thumb_nytimes.pngbin16333 -> 0 bytes
-rw-r--r--res/raw/thumb_picasa.pngbin15064 -> 0 bytes
-rw-r--r--res/raw/thumb_twitter.pngbin13770 -> 0 bytes
-rw-r--r--res/raw/thumb_weatherchannel.pngbin21618 -> 0 bytes
-rw-r--r--res/raw/thumb_wikipedia.pngbin8640 -> 0 bytes
-rw-r--r--res/raw/thumb_yahoo.pngbin15376 -> 0 bytes
-rw-r--r--res/values-sw600dp/styles.xml4
-rw-r--r--res/values/bookmarks_icons.xml30
-rw-r--r--res/values/integers.xml8
-rw-r--r--res/values/strings.xml35
-rw-r--r--src/com/android/browser/provider/BrowserProvider.java37
95 files changed, 255 insertions, 97 deletions
diff --git a/res/drawable-hdpi/ic_add_string.png b/res/drawable-hdpi/ic_add_string.png
deleted file mode 100644
index 34d1324c7..000000000
--- a/res/drawable-hdpi/ic_add_string.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_back_dark.png b/res/drawable-hdpi/ic_back_dark.png
deleted file mode 100644
index 5fa494878..000000000
--- a/res/drawable-hdpi/ic_back_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_back_disabled_dark.png b/res/drawable-hdpi/ic_back_disabled_dark.png
deleted file mode 100644
index 5fa494878..000000000
--- a/res/drawable-hdpi/ic_back_disabled_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_bookmarks_dark.png b/res/drawable-hdpi/ic_bookmarks_dark.png
deleted file mode 100644
index b29d9a21a..000000000
--- a/res/drawable-hdpi/ic_bookmarks_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_bookmarks_history_dark.png b/res/drawable-hdpi/ic_bookmarks_history_dark.png
deleted file mode 100644
index b29d9a21a..000000000
--- a/res/drawable-hdpi/ic_bookmarks_history_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_close_window_dark.png b/res/drawable-hdpi/ic_close_window_dark.png
deleted file mode 100644
index 0fd15563a..000000000
--- a/res/drawable-hdpi/ic_close_window_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_forward_dark.png b/res/drawable-hdpi/ic_forward_dark.png
deleted file mode 100644
index 15126856f..000000000
--- a/res/drawable-hdpi/ic_forward_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_forward_disabled_dark.png b/res/drawable-hdpi/ic_forward_disabled_dark.png
deleted file mode 100644
index 15126856f..000000000
--- a/res/drawable-hdpi/ic_forward_disabled_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_overflow.png b/res/drawable-hdpi/ic_menu_overflow.png
deleted file mode 100644
index fdc4a5ad2..000000000
--- a/res/drawable-hdpi/ic_menu_overflow.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_new_window_dark.png b/res/drawable-hdpi/ic_new_window_dark.png
deleted file mode 100644
index 481643ecd..000000000
--- a/res/drawable-hdpi/ic_new_window_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_stop_dark.png b/res/drawable-hdpi/ic_stop_dark.png
deleted file mode 100644
index 0fd15563a..000000000
--- a/res/drawable-hdpi/ic_stop_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_add_string.png b/res/drawable-mdpi/ic_add_string.png
deleted file mode 100644
index 621dee06d..000000000
--- a/res/drawable-mdpi/ic_add_string.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_back_dark.png b/res/drawable-mdpi/ic_back_dark.png
deleted file mode 100644
index 9e662f6d4..000000000
--- a/res/drawable-mdpi/ic_back_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_back_disabled_dark.png b/res/drawable-mdpi/ic_back_disabled_dark.png
deleted file mode 100644
index 9e662f6d4..000000000
--- a/res/drawable-mdpi/ic_back_disabled_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_bookmarks_dark.png b/res/drawable-mdpi/ic_bookmarks_dark.png
deleted file mode 100644
index ec69d41f2..000000000
--- a/res/drawable-mdpi/ic_bookmarks_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_bookmarks_history_dark.png b/res/drawable-mdpi/ic_bookmarks_history_dark.png
deleted file mode 100644
index ec69d41f2..000000000
--- a/res/drawable-mdpi/ic_bookmarks_history_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_close_window_dark.png b/res/drawable-mdpi/ic_close_window_dark.png
deleted file mode 100644
index e80681aeb..000000000
--- a/res/drawable-mdpi/ic_close_window_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_forward_dark.png b/res/drawable-mdpi/ic_forward_dark.png
deleted file mode 100644
index c62019b32..000000000
--- a/res/drawable-mdpi/ic_forward_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_forward_disabled_dark.png b/res/drawable-mdpi/ic_forward_disabled_dark.png
deleted file mode 100644
index c62019b32..000000000
--- a/res/drawable-mdpi/ic_forward_disabled_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_overflow.png b/res/drawable-mdpi/ic_menu_overflow.png
deleted file mode 100644
index 1d8ad18a0..000000000
--- a/res/drawable-mdpi/ic_menu_overflow.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_new_window_dark.png b/res/drawable-mdpi/ic_new_window_dark.png
deleted file mode 100644
index 977dd3427..000000000
--- a/res/drawable-mdpi/ic_new_window_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_stop_dark.png b/res/drawable-mdpi/ic_stop_dark.png
deleted file mode 100644
index e80681aeb..000000000
--- a/res/drawable-mdpi/ic_stop_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_add_string.png b/res/drawable-xhdpi/ic_add_string.png
deleted file mode 100644
index 7ea150dd3..000000000
--- a/res/drawable-xhdpi/ic_add_string.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_back_dark.png b/res/drawable-xhdpi/ic_back_dark.png
deleted file mode 100644
index addbfc886..000000000
--- a/res/drawable-xhdpi/ic_back_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_back_disabled_dark.png b/res/drawable-xhdpi/ic_back_disabled_dark.png
deleted file mode 100644
index addbfc886..000000000
--- a/res/drawable-xhdpi/ic_back_disabled_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bookmarks_dark.png b/res/drawable-xhdpi/ic_bookmarks_dark.png
deleted file mode 100644
index f9f17801b..000000000
--- a/res/drawable-xhdpi/ic_bookmarks_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bookmarks_history_dark.png b/res/drawable-xhdpi/ic_bookmarks_history_dark.png
deleted file mode 100644
index f9f17801b..000000000
--- a/res/drawable-xhdpi/ic_bookmarks_history_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_close_window_dark.png b/res/drawable-xhdpi/ic_close_window_dark.png
deleted file mode 100644
index 76e07f097..000000000
--- a/res/drawable-xhdpi/ic_close_window_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_forward_dark.png b/res/drawable-xhdpi/ic_forward_dark.png
deleted file mode 100644
index 5ec935678..000000000
--- a/res/drawable-xhdpi/ic_forward_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_forward_disabled_dark.png b/res/drawable-xhdpi/ic_forward_disabled_dark.png
deleted file mode 100644
index 5ec935678..000000000
--- a/res/drawable-xhdpi/ic_forward_disabled_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_overflow.png b/res/drawable-xhdpi/ic_menu_overflow.png
deleted file mode 100644
index 1b04eda04..000000000
--- a/res/drawable-xhdpi/ic_menu_overflow.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_new_window_dark.png b/res/drawable-xhdpi/ic_new_window_dark.png
deleted file mode 100644
index 67042105d..000000000
--- a/res/drawable-xhdpi/ic_new_window_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_stop_dark.png b/res/drawable-xhdpi/ic_stop_dark.png
deleted file mode 100644
index 0eb9d8b08..000000000
--- a/res/drawable-xhdpi/ic_stop_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_add_string.png b/res/drawable-xxhdpi/ic_add_string.png
deleted file mode 100644
index 7ea150dd3..000000000
--- a/res/drawable-xxhdpi/ic_add_string.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_back_dark.png b/res/drawable-xxhdpi/ic_back_dark.png
deleted file mode 100644
index 4057cc545..000000000
--- a/res/drawable-xxhdpi/ic_back_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_back_disabled_dark.png b/res/drawable-xxhdpi/ic_back_disabled_dark.png
deleted file mode 100644
index 4057cc545..000000000
--- a/res/drawable-xxhdpi/ic_back_disabled_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_bookmarks_dark.png b/res/drawable-xxhdpi/ic_bookmarks_dark.png
deleted file mode 100644
index 7267a25fd..000000000
--- a/res/drawable-xxhdpi/ic_bookmarks_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_bookmarks_history_dark.png b/res/drawable-xxhdpi/ic_bookmarks_history_dark.png
deleted file mode 100644
index 7267a25fd..000000000
--- a/res/drawable-xxhdpi/ic_bookmarks_history_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_close_window_dark.png b/res/drawable-xxhdpi/ic_close_window_dark.png
deleted file mode 100644
index 0eb9d8b08..000000000
--- a/res/drawable-xxhdpi/ic_close_window_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_forward_dark.png b/res/drawable-xxhdpi/ic_forward_dark.png
deleted file mode 100644
index 5ec935678..000000000
--- a/res/drawable-xxhdpi/ic_forward_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_forward_disabled_dark.png b/res/drawable-xxhdpi/ic_forward_disabled_dark.png
deleted file mode 100644
index 5ec935678..000000000
--- a/res/drawable-xxhdpi/ic_forward_disabled_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_menu_overflow.png b/res/drawable-xxhdpi/ic_menu_overflow.png
deleted file mode 100644
index 2ed4457a4..000000000
--- a/res/drawable-xxhdpi/ic_menu_overflow.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_new_window_dark.png b/res/drawable-xxhdpi/ic_new_window_dark.png
deleted file mode 100644
index 49b3e0b0e..000000000
--- a/res/drawable-xxhdpi/ic_new_window_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_stop_dark.png b/res/drawable-xxhdpi/ic_stop_dark.png
deleted file mode 100644
index 0eb9d8b08..000000000
--- a/res/drawable-xxhdpi/ic_stop_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/app_web_browser_sm.xml b/res/drawable/app_web_browser_sm.xml
new file mode 100644
index 000000000..6aaf19f71
--- /dev/null
+++ b/res/drawable/app_web_browser_sm.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <group>
+ <path
+ android:pathData="M0 0h24v24h-24z" />
+ <path
+ android:fillColor="#fafafa"
+ android:pathData="M12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm-1
+17.93c-3.95-.49-7-3.85-7-7.93 0-.62 .08 -1.21 .21 -1.79l4.79 4.79v1c0 1.1 .9 2 2
+2v1.93zm6.9-2.54c-.26-.81-1-1.39-1.9-1.39h-1v-3c0-.55-.45-1-1-1h-6v-2h2c.55 0
+1-.45 1-1v-2h2c1.1 0 2-.9 2-2v-.41c2.93 1.19 5 4.06 5 7.41 0 2.08-.8 3.97-2.1
+5.39z" />
+ </group>
+</vector>
diff --git a/res/drawable/ic_add_string.xml b/res/drawable/ic_add_string.xml
new file mode 100644
index 000000000..c792d9afc
--- /dev/null
+++ b/res/drawable/ic_add_string.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <group>
+ <path
+ android:fillColor="#212121"
+ android:pathData="M19 13h-6v6h-2v-6h-6v-2h6v-6h2v6h6v2z" />
+ <path
+ android:pathData="M0 0h24v24h-24z" />
+ </group>
+</vector>
diff --git a/res/drawable/ic_back_dark.xml b/res/drawable/ic_back_dark.xml
new file mode 100644
index 000000000..f47092349
--- /dev/null
+++ b/res/drawable/ic_back_dark.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <group>
+ <path
+ android:pathData="M0 0h24v24h-24z" />
+ <path
+ android:fillColor="#fafafa"
+ android:pathData="M20 11h-12.17l5.59-5.59-1.42-1.41-8 8 8 8 1.41-1.41-5.58-5.59h12.17v-2z" />
+ </group>
+</vector>
diff --git a/res/drawable/ic_back_disabled_dark.xml b/res/drawable/ic_back_disabled_dark.xml
new file mode 100644
index 000000000..f47092349
--- /dev/null
+++ b/res/drawable/ic_back_disabled_dark.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <group>
+ <path
+ android:pathData="M0 0h24v24h-24z" />
+ <path
+ android:fillColor="#fafafa"
+ android:pathData="M20 11h-12.17l5.59-5.59-1.42-1.41-8 8 8 8 1.41-1.41-5.58-5.59h12.17v-2z" />
+ </group>
+</vector>
diff --git a/res/drawable/ic_back_hierarchy_dark.xml b/res/drawable/ic_back_hierarchy_dark.xml
new file mode 100644
index 000000000..07defc91c
--- /dev/null
+++ b/res/drawable/ic_back_hierarchy_dark.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <group>
+ <path
+ android:fillColor="#fafafa"
+ android:pathData="M15.41 7.41l-1.41-1.41-6 6 6 6 1.41-1.41-4.58-4.59z" />
+ <path
+ android:pathData="M0 0h24v24h-24z" />
+ </group>
+</vector>
diff --git a/res/drawable/ic_bookmarks_dark.xml b/res/drawable/ic_bookmarks_dark.xml
new file mode 100644
index 000000000..a7d734249
--- /dev/null
+++ b/res/drawable/ic_bookmarks_dark.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <group>
+ <path
+ android:fillColor="#fafafa"
+ android:pathData="M17 3h-10c-1.1 0-1.99 .9 -1.99 2l-.01 16 7-3 7 3v-16c0-1.1-.9-2-2-2zm0
+15l-5-2.18-5 2.18v-13h10v13z" />
+ <path
+ android:pathData="M0 0h24v24h-24z" />
+ </group>
+</vector>
diff --git a/res/drawable/ic_bookmarks_history_dark.xml b/res/drawable/ic_bookmarks_history_dark.xml
new file mode 100644
index 000000000..a7d734249
--- /dev/null
+++ b/res/drawable/ic_bookmarks_history_dark.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <group>
+ <path
+ android:fillColor="#fafafa"
+ android:pathData="M17 3h-10c-1.1 0-1.99 .9 -1.99 2l-.01 16 7-3 7 3v-16c0-1.1-.9-2-2-2zm0
+15l-5-2.18-5 2.18v-13h10v13z" />
+ <path
+ android:pathData="M0 0h24v24h-24z" />
+ </group>
+</vector>
diff --git a/res/drawable/ic_close_window_dark.xml b/res/drawable/ic_close_window_dark.xml
new file mode 100644
index 000000000..5e497488d
--- /dev/null
+++ b/res/drawable/ic_close_window_dark.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <group>
+ <path
+ android:fillColor="#fafafa"
+ android:pathData="M19 6.41l-1.41-1.41-5.59 5.59-5.59-5.59-1.41 1.41 5.59 5.59-5.59 5.59 1.41 1.41
+5.59-5.59 5.59 5.59 1.41-1.41-5.59-5.59z" />
+ <path
+ android:pathData="M0 0h24v24h-24z" />
+ </group>
+</vector>
diff --git a/res/drawable/ic_forward_dark.xml b/res/drawable/ic_forward_dark.xml
new file mode 100644
index 000000000..b75da6cdb
--- /dev/null
+++ b/res/drawable/ic_forward_dark.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <group>
+ <path
+ android:pathData="M0 0h24v24h-24z" />
+ <path
+ android:fillColor="#fafafa"
+ android:pathData="M12 4l-1.41 1.41 5.58 5.59h-12.17v2h12.17l-5.58 5.59 1.41 1.41 8-8z" />
+ </group>
+</vector>
diff --git a/res/drawable/ic_forward_disabled_dark.xml b/res/drawable/ic_forward_disabled_dark.xml
new file mode 100644
index 000000000..b75da6cdb
--- /dev/null
+++ b/res/drawable/ic_forward_disabled_dark.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <group>
+ <path
+ android:pathData="M0 0h24v24h-24z" />
+ <path
+ android:fillColor="#fafafa"
+ android:pathData="M12 4l-1.41 1.41 5.58 5.59h-12.17v2h12.17l-5.58 5.59 1.41 1.41 8-8z" />
+ </group>
+</vector>
diff --git a/res/drawable/ic_menu_overflow.xml b/res/drawable/ic_menu_overflow.xml
new file mode 100644
index 000000000..d09f60d00
--- /dev/null
+++ b/res/drawable/ic_menu_overflow.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <group>
+ <path
+ android:pathData="M0 0h24v24h-24z" />
+ <path
+ android:fillColor="#fafafa"
+ android:pathData="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2
+2-.9 2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z" />
+ </group>
+</vector>
diff --git a/res/drawable/ic_new_window_dark.xml b/res/drawable/ic_new_window_dark.xml
new file mode 100644
index 000000000..2339658e7
--- /dev/null
+++ b/res/drawable/ic_new_window_dark.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <group>
+ <path
+ android:fillColor="#fafafa"
+ android:pathData="M19 13h-6v6h-2v-6h-6v-2h6v-6h2v6h6v2z" />
+ <path
+ android:pathData="M0 0h24v24h-24z" />
+ </group>
+</vector>
diff --git a/res/drawable/ic_refresh_dark.xml b/res/drawable/ic_refresh_dark.xml
new file mode 100644
index 000000000..674c8fda7
--- /dev/null
+++ b/res/drawable/ic_refresh_dark.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <group>
+ <path
+ android:fillColor="#fafafa"
+ android:pathData="M17.65 6.35c-1.45-1.45-3.44-2.35-5.65-2.35-4.42 0-7.99 3.58-7.99 8s3.57 8 7.99
+8c3.73 0 6.84-2.55 7.73-6h-2.08c-.82 2.33-3.04 4-5.65 4-3.31 0-6-2.69-6-6s2.69-6
+6-6c1.66 0 3.14 .69 4.22 1.78l-3.22 3.22h7v-7l-2.35 2.35z" />
+ <path
+ android:pathData="M0 0h24v24h-24z" />
+ </group>
+</vector>
diff --git a/res/drawable/ic_stop_dark.xml b/res/drawable/ic_stop_dark.xml
new file mode 100644
index 000000000..5e497488d
--- /dev/null
+++ b/res/drawable/ic_stop_dark.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <group>
+ <path
+ android:fillColor="#fafafa"
+ android:pathData="M19 6.41l-1.41-1.41-5.59 5.59-5.59-5.59-1.41 1.41 5.59 5.59-5.59 5.59 1.41 1.41
+5.59-5.59 5.59 5.59 1.41-1.41-5.59-5.59z" />
+ <path
+ android:pathData="M0 0h24v24h-24z" />
+ </group>
+</vector>
diff --git a/res/drawable/ic_tab_close.xml b/res/drawable/ic_tab_close.xml
new file mode 100644
index 000000000..34dbb5dcf
--- /dev/null
+++ b/res/drawable/ic_tab_close.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <group>
+ <path
+ android:fillColor="#fafafa"
+ android:pathData="M12 2c-5.53 0-10 4.47-10 10s4.47 10 10 10 10-4.47 10-10-4.47-10-10-10zm5
+13.59l-1.41 1.41-3.59-3.59-3.59 3.59-1.41-1.41 3.59-3.59-3.59-3.59 1.41-1.41
+3.59 3.59 3.59-3.59 1.41 1.41-3.59 3.59 3.59 3.59z" />
+ <path
+ android:pathData="M0 0h24v24h-24z" />
+ </group>
+</vector>
diff --git a/res/raw/favicon_amazon.ico b/res/raw/favicon_amazon.ico
deleted file mode 100644
index 20a959c12..000000000
--- a/res/raw/favicon_amazon.ico
+++ /dev/null
Binary files differ
diff --git a/res/raw/favicon_bbc.ico b/res/raw/favicon_bbc.ico
deleted file mode 100644
index 8f62b07af..000000000
--- a/res/raw/favicon_bbc.ico
+++ /dev/null
Binary files differ
diff --git a/res/raw/favicon_cmwiki.ico b/res/raw/favicon_cmwiki.ico
new file mode 100644
index 000000000..f9afe7530
--- /dev/null
+++ b/res/raw/favicon_cmwiki.ico
Binary files differ
diff --git a/res/raw/favicon_cnn.ico b/res/raw/favicon_cnn.ico
deleted file mode 100644
index 4a8421dc5..000000000
--- a/res/raw/favicon_cnn.ico
+++ /dev/null
Binary files differ
diff --git a/res/raw/favicon_cyanogenmod.ico b/res/raw/favicon_cyanogenmod.ico
new file mode 100644
index 000000000..2afa6a119
--- /dev/null
+++ b/res/raw/favicon_cyanogenmod.ico
Binary files differ
diff --git a/res/raw/favicon_ebay.ico b/res/raw/favicon_ebay.ico
deleted file mode 100644
index d7c8a5e46..000000000
--- a/res/raw/favicon_ebay.ico
+++ /dev/null
Binary files differ
diff --git a/res/raw/favicon_espn.ico b/res/raw/favicon_espn.ico
deleted file mode 100644
index 2dbe28a7c..000000000
--- a/res/raw/favicon_espn.ico
+++ /dev/null
Binary files differ
diff --git a/res/raw/favicon_facebook.ico b/res/raw/favicon_facebook.ico
deleted file mode 100644
index ea0c6a373..000000000
--- a/res/raw/favicon_facebook.ico
+++ /dev/null
Binary files differ
diff --git a/res/raw/favicon_msn.ico b/res/raw/favicon_msn.ico
deleted file mode 100644
index b2279f554..000000000
--- a/res/raw/favicon_msn.ico
+++ /dev/null
Binary files differ
diff --git a/res/raw/favicon_nytimes.ico b/res/raw/favicon_nytimes.ico
deleted file mode 100644
index fb4d000a3..000000000
--- a/res/raw/favicon_nytimes.ico
+++ /dev/null
Binary files differ
diff --git a/res/raw/favicon_picasa.ico b/res/raw/favicon_picasa.ico
deleted file mode 100644
index 22133b880..000000000
--- a/res/raw/favicon_picasa.ico
+++ /dev/null
Binary files differ
diff --git a/res/raw/favicon_twitter.ico b/res/raw/favicon_twitter.ico
deleted file mode 100644
index 00450d4fe..000000000
--- a/res/raw/favicon_twitter.ico
+++ /dev/null
Binary files differ
diff --git a/res/raw/favicon_weatherchannel.ico b/res/raw/favicon_weatherchannel.ico
deleted file mode 100644
index 5a568189e..000000000
--- a/res/raw/favicon_weatherchannel.ico
+++ /dev/null
Binary files differ
diff --git a/res/raw/favicon_wikipedia.ico b/res/raw/favicon_wikipedia.ico
deleted file mode 100644
index 31b0e3809..000000000
--- a/res/raw/favicon_wikipedia.ico
+++ /dev/null
Binary files differ
diff --git a/res/raw/favicon_yahoo.ico b/res/raw/favicon_yahoo.ico
deleted file mode 100644
index d7761e5a9..000000000
--- a/res/raw/favicon_yahoo.ico
+++ /dev/null
Binary files differ
diff --git a/res/raw/thumb_amazon.png b/res/raw/thumb_amazon.png
deleted file mode 100644
index 4dd2f35bc..000000000
--- a/res/raw/thumb_amazon.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/thumb_bbc.png b/res/raw/thumb_bbc.png
deleted file mode 100644
index dff04248c..000000000
--- a/res/raw/thumb_bbc.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/thumb_cmwiki.png b/res/raw/thumb_cmwiki.png
new file mode 100644
index 000000000..bb33f237b
--- /dev/null
+++ b/res/raw/thumb_cmwiki.png
Binary files differ
diff --git a/res/raw/thumb_cnn.png b/res/raw/thumb_cnn.png
deleted file mode 100644
index 3d6fdc9ac..000000000
--- a/res/raw/thumb_cnn.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/thumb_cyanogenmod.png b/res/raw/thumb_cyanogenmod.png
new file mode 100644
index 000000000..6fa7d6893
--- /dev/null
+++ b/res/raw/thumb_cyanogenmod.png
Binary files differ
diff --git a/res/raw/thumb_ebay.png b/res/raw/thumb_ebay.png
deleted file mode 100644
index 023f67858..000000000
--- a/res/raw/thumb_ebay.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/thumb_espn.png b/res/raw/thumb_espn.png
deleted file mode 100644
index c0882ebb9..000000000
--- a/res/raw/thumb_espn.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/thumb_facebook.png b/res/raw/thumb_facebook.png
deleted file mode 100644
index a8c047f42..000000000
--- a/res/raw/thumb_facebook.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/thumb_google.png b/res/raw/thumb_google.png
index c54e6ea05..bb93d82fe 100644
--- a/res/raw/thumb_google.png
+++ b/res/raw/thumb_google.png
Binary files differ
diff --git a/res/raw/thumb_msn.png b/res/raw/thumb_msn.png
deleted file mode 100644
index 4ad710f5c..000000000
--- a/res/raw/thumb_msn.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/thumb_nytimes.png b/res/raw/thumb_nytimes.png
deleted file mode 100644
index d6849c360..000000000
--- a/res/raw/thumb_nytimes.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/thumb_picasa.png b/res/raw/thumb_picasa.png
deleted file mode 100644
index 5ec2d7ac2..000000000
--- a/res/raw/thumb_picasa.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/thumb_twitter.png b/res/raw/thumb_twitter.png
deleted file mode 100644
index 95e247f44..000000000
--- a/res/raw/thumb_twitter.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/thumb_weatherchannel.png b/res/raw/thumb_weatherchannel.png
deleted file mode 100644
index a190a0c51..000000000
--- a/res/raw/thumb_weatherchannel.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/thumb_wikipedia.png b/res/raw/thumb_wikipedia.png
deleted file mode 100644
index 792946877..000000000
--- a/res/raw/thumb_wikipedia.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/thumb_yahoo.png b/res/raw/thumb_yahoo.png
deleted file mode 100644
index 08dd759b6..000000000
--- a/res/raw/thumb_yahoo.png
+++ /dev/null
Binary files differ
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 20e42f440..3b0d9e99f 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -35,4 +35,8 @@
<style name="ActionBarStyle" parent="@android:style/ThemeOverlay.Material.Dark.ActionBar">
<item name="android:background">@color/primary</item>
</style>
+ <style name="DialogWhenLarge" parent="@android:style/Theme.Material.DialogWhenLarge" >
+ <item name="android:windowActionBar">false</item>
+ <item name="android:popupBackground">#fafafa</item>
+ </style>
</resources>
diff --git a/res/values/bookmarks_icons.xml b/res/values/bookmarks_icons.xml
index 5d8e85ac1..50d7eaf60 100644
--- a/res/values/bookmarks_icons.xml
+++ b/res/values/bookmarks_icons.xml
@@ -3,31 +3,9 @@
<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>
+ <item>@raw/favicon_cyanogenmod</item>
+ <item>@raw/thumb_cyanogenmod</item>
+ <item>@raw/favicon_cmwiki</item>
+ <item>@raw/thumb_cmwiki</item>
</array>
</resources>
diff --git a/res/values/integers.xml b/res/values/integers.xml
index 5f757238d..b7fc85ede 100644
--- a/res/values/integers.xml
+++ b/res/values/integers.xml
@@ -19,15 +19,15 @@
<!-- The maximum number of open tabs -->
<integer name="max_tabs">16</integer>
<!-- The duration of the tab animations in millisecs -->
- <integer name="tab_animation_duration">200</integer>
+ <integer name="tab_animation_duration">400</integer>
<!-- The maximum number of most visited URLs in the history tab -->
<integer name="most_visits_limit">10</integer>
<!-- Animation durations -->
- <integer name="comboViewFadeInDuration">400</integer>
+ <integer name="comboViewFadeInDuration">500</integer>
<!-- fade between tabs duration -->
- <integer name="tabFadeDuration">300</integer>
+ <integer name="tabFadeDuration">400</integer>
<!-- The maximum number of columns in the bookmark grid view -->
<integer name="max_bookmark_columns">5</integer>
<!-- The duration of the titlebar animation in millisecs -->
- <integer name="titlebar_animation_duration">200</integer>
+ <integer name="titlebar_animation_duration">300</integer>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index bba4dbe2c..3026ba531 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -800,38 +800,13 @@
<!-- 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>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.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>
</string-array>
- <!-- Bookmark name for Picasa website -->
- <string name="picasa" translatable="false">Picasa</string>
-
<!-- The description of the suggestion that lets the user search the web for the query currently
in the text field. -->
<string name="search_the_web">Search the web</string>
diff --git a/src/com/android/browser/provider/BrowserProvider.java b/src/com/android/browser/provider/BrowserProvider.java
index 744032c9c..0b3ef94a1 100644
--- a/src/com/android/browser/provider/BrowserProvider.java
+++ b/src/com/android/browser/provider/BrowserProvider.java
@@ -61,9 +61,6 @@ public class BrowserProvider extends ContentProvider {
private static final String TAG = "BrowserProvider";
private static final String ORDER_BY = "visits DESC, date DESC";
- private static final String PICASA_URL = "http://picasaweb.google.com/m/" +
- "viewer?source=androidclient";
-
static final String[] TABLE_NAMES = new String[] {
"bookmarks", "searches"
};
@@ -405,44 +402,10 @@ public class BrowserProvider extends ContentProvider {
}
mOpenHelper = new DatabaseHelper(context);
mBackupManager = new BackupManager(context);
- // we added "picasa web album" into default bookmarks for version 19.
- // To avoid erasing the bookmark table, we added it explicitly for
- // version 18 and 19 as in the other cases, we will erase the table.
- if (DATABASE_VERSION == 18 || DATABASE_VERSION == 19) {
- SharedPreferences p = PreferenceManager
- .getDefaultSharedPreferences(context);
- boolean fix = p.getBoolean("fix_picasa", true);
- if (fix) {
- fixPicasaBookmark();
- Editor ed = p.edit();
- ed.putBoolean("fix_picasa", false);
- ed.apply();
- }
- }
mSettings = BrowserSettings.getInstance();
return true;
}
- private void fixPicasaBookmark() {
- SQLiteDatabase db = mOpenHelper.getWritableDatabase();
- Cursor cursor = db.rawQuery("SELECT _id FROM bookmarks WHERE " +
- "bookmark = 1 AND url = ?", new String[] { PICASA_URL });
- try {
- if (!cursor.moveToFirst()) {
- // set "created" so that it will be on the top of the list
- db.execSQL("INSERT INTO bookmarks (title, url, visits, " +
- "date, created, bookmark)" + " VALUES('" +
- getContext().getString(R.string.picasa) + "', '"
- + PICASA_URL + "', 0, 0, " + new Date().getTime()
- + ", 1);");
- }
- } finally {
- if (cursor != null) {
- cursor.close();
- }
- }
- }
-
/*
* Subclass AbstractCursor so we can combine multiple Cursors and add
* "Search the web".