summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-12-13 14:48:35 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-12-13 14:48:35 -0800
commit462eda547c86ca3994cb3a5033e89afa4fb32479 (patch)
tree5dc8655ec39e5e403a4e4d44d55cb9a860b2fce1
parent152c74792b2ba22611bd4994bd9a7a2de1e97f76 (diff)
parent1e43249af8df208486d890fc86ae45ab39045221 (diff)
downloadpackages_apps_browser-462eda547c86ca3994cb3a5033e89afa4fb32479.zip
packages_apps_browser-462eda547c86ca3994cb3a5033e89afa4fb32479.tar.gz
packages_apps_browser-462eda547c86ca3994cb3a5033e89afa4fb32479.tar.bz2
am 1e43249a: Revert "Add new default bookmark"
* commit '1e43249af8df208486d890fc86ae45ab39045221': Revert "Add new default bookmark"
-rw-r--r--res/raw/thumb_help.pngbin9792 -> 0 bytes
-rw-r--r--res/values/bookmarks_icons.xml2
-rw-r--r--res/values/strings.xml5
3 files changed, 0 insertions, 7 deletions
diff --git a/res/raw/thumb_help.png b/res/raw/thumb_help.png
deleted file mode 100644
index d8d72a2..0000000
--- a/res/raw/thumb_help.png
+++ /dev/null
Binary files differ
diff --git a/res/values/bookmarks_icons.xml b/res/values/bookmarks_icons.xml
index afad0ce..5d8e85a 100644
--- a/res/values/bookmarks_icons.xml
+++ b/res/values/bookmarks_icons.xml
@@ -3,8 +3,6 @@
<array name="bookmark_preloads">
<item>@raw/favicon_google</item>
<item>@raw/thumb_google</item>
- <item>@raw/favicon_google</item>
- <item>@raw/thumb_help</item>
<item>@raw/favicon_picasa</item>
<item>@raw/thumb_picasa</item>
<item>@raw/favicon_yahoo</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1e5f68f..6a1a6f1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -774,15 +774,10 @@
<string name="instant_base" translatable="false">
http://www.google.com/webhp?client={CID}&amp;source=android-instant&amp;ion=1</string>
- <!-- The name of the help page bookmark [CHAR LIMIT=10] -->
- <string name="help_page">Help</string>
-
<!-- Bookmarks -->
<string-array name="bookmarks" translatable="false">
<item>Google</item>
<item>http://www.google.com/</item>
- <item>@string/help_page</item>
- <item>http://www.google.com/support/mobile/?p=help_home</item>
<item>Picasa</item>
<item>http://picasaweb.google.com/</item>
<item>Yahoo!</item>