commit d8f7c8c4f9e863dffa965df48121392a3042a7d7
author John Reck <jreck@google.com> Thu Oct 27 16:18:10 2011 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 27 16:18:10 2011 +0000
tree 8aafd74c9e6dafb8d61a8de907872a40a2aa5240
parent 6f336409081c173b1890aee4d381f3ef10815b7c
parent 79e36dbe90997dbd2d276241bfac8cc2c2bac9f0

am 79e36dbe: Merge "Add new default bookmark" into ics-mr1

* commit '79e36dbe90997dbd2d276241bfac8cc2c2bac9f0':
  Add new default bookmark

res/raw/thumb_help.png

diff --git a/res/raw/thumb_help.png b/res/raw/thumb_help.png
new file mode 100644
index 0000000..9f18fc1
--- /dev/null
+++ b/res/raw/thumb_help.png
Binary files differ

res/values/bookmarks_icons.xml

diff --git a/res/values/bookmarks_icons.xml b/res/values/bookmarks_icons.xml
index 5d8e85a..afad0ce 100644
--- a/res/values/bookmarks_icons.xml
+++ b/res/values/bookmarks_icons.xml
@@ -3,6 +3,8 @@
     <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>

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6a1a6f1..1e5f68f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -774,10 +774,15 @@
     <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>