auto import from //depot/cupcake/@135843
diff --git a/res/menu/bookmarks.xml b/res/menu/bookmarks.xml
new file mode 100644
index 0000000..50dcfa9
--- /dev/null
+++ b/res/menu/bookmarks.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/new_context_menu_id"
+        android:icon="@android:drawable/ic_menu_add"
+        android:title="@string/bookmark_page" />
+</menu>
diff --git a/res/menu/bookmarkscontext.xml b/res/menu/bookmarkscontext.xml
new file mode 100644
index 0000000..b43e242
--- /dev/null
+++ b/res/menu/bookmarkscontext.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+  <group android:id="@+id/ADD_MENU">
+    <item android:id="@+id/new_context_menu_id"
+      android:title="@string/save_to_bookmarks"/>
+  </group>
+  <group android:id="@+id/CONTEXT_MENU">
+    <item android:id="@+id/open_context_menu_id"
+      android:title="@string/open_bookmark"/>
+    <item android:id="@+id/new_window_context_menu_id"
+      android:title="@string/open_in_new_window"/>
+    <item android:id="@+id/edit_context_menu_id"
+      android:title="@string/edit_bookmark"/>
+    <item android:id="@+id/shortcut_context_menu_id"
+      android:title="@string/create_shortcut_bookmark"/>
+    <item android:id="@+id/send_context_menu_id"
+      android:title="@string/tab_picker_send_url"/>
+    <item android:id="@+id/copy_url_context_menu_id"
+      android:title="@string/contextmenu_copylink"/>
+    <item android:id="@+id/delete_context_menu_id"
+      android:title="@string/remove_bookmark"/>
+  </group>
+</menu>
diff --git a/res/menu/browser.xml b/res/menu/browser.xml
new file mode 100644
index 0000000..088fb6e
--- /dev/null
+++ b/res/menu/browser.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <group android:id="@+id/MAIN_MENU">
+        <item android:id="@+id/goto_menu_id"
+            android:title="@string/goto_dot" 
+            android:alphabeticShortcut="l" 
+            android:icon="@android:drawable/ic_menu_search"/>
+        <item android:id="@+id/bookmarks_menu_id"
+            android:title="@string/bookmarks" 
+            android:alphabeticShortcut="b" 
+            android:icon="@drawable/ic_menu_bookmark" />
+        <item android:id="@+id/windows_menu_id"
+            android:title="@string/view_tabs" 
+            android:alphabeticShortcut="t" 
+            android:titleCondensed="@string/view_tabs_condensed"
+            android:icon="@drawable/ic_menu_windows" />
+        <item android:id="@+id/stop_reload_menu_id"
+            android:alphabeticShortcut="r" />
+        <item android:id="@+id/forward_menu_id"
+            android:title="@string/forward" 
+            android:alphabeticShortcut="k"
+            android:icon="@*android:drawable/ic_menu_forward" />
+        <item android:id="@+id/find_menu_id"
+            android:title="@string/find_dot" 
+            android:alphabeticShortcut="f" />
+        <item android:id="@+id/select_text_id"
+            android:title="@string/select_dot" />
+        <item android:id="@+id/page_info_menu_id"
+            android:title="@string/page_info"
+            android:alphabeticShortcut="g" />
+        <item android:id="@+id/share_page_menu_id"
+            android:title="@string/share_page"/>
+        <item android:id="@+id/view_downloads_menu_id"
+            android:title="@string/menu_view_download"
+            android:alphabeticShortcut="d" />
+        <item android:id="@+id/preferences_menu_id"
+            android:title="@string/menu_preferences"
+            android:alphabeticShortcut="p" />
+        <!-- followings are debug only -->
+        <item android:id="@+id/dump_nav_menu_id"
+            android:title="@string/dump_nav"
+            android:visible="false" />
+    </group>
+    <group android:id="@+id/MAIN_SHORTCUT_MENU" android:visible="false">
+        <item android:id="@+id/back_menu_id"
+            android:alphabeticShortcut="j" />
+        <item android:id="@+id/close_menu_id"
+            android:alphabeticShortcut="w" />
+        <item android:id="@+id/homepage_menu_id"
+            android:alphabeticShortcut="&#32;" />
+        <item android:id="@+id/classic_history_menu_id"
+            android:alphabeticShortcut="h" />
+        <item android:id="@+id/zoom_in_menu_id"
+            android:alphabeticShortcut="i" />
+        <item android:id="@+id/zoom_out_menu_id"
+            android:alphabeticShortcut="o" />
+        <item android:id="@+id/window_one_menu_id"
+            android:alphabeticShortcut="1" />
+        <item android:id="@+id/window_two_menu_id"
+            android:alphabeticShortcut="2" />
+        <item android:id="@+id/window_three_menu_id"
+            android:alphabeticShortcut="3" />
+        <item android:id="@+id/window_four_menu_id"
+            android:alphabeticShortcut="4" />
+        <item android:id="@+id/window_five_menu_id"
+            android:alphabeticShortcut="5" />
+        <item android:id="@+id/window_six_menu_id"
+            android:alphabeticShortcut="6" />
+        <item android:id="@+id/window_seven_menu_id"
+            android:alphabeticShortcut="7" />
+        <item android:id="@+id/window_eight_menu_id"
+            android:alphabeticShortcut="8" />
+    </group>
+    <group android:id="@+id/TAB_MENU">
+        <item android:id="@+id/new_tab_menu_id"
+            android:title="@string/tab_picker_new_tab"
+            android:alphabeticShortcut="t" 
+            android:icon="@android:drawable/ic_menu_add" />
+        <item android:id="@+id/bookmarks_tab_menu_id"
+            android:title="@string/bookmarks" 
+            android:alphabeticShortcut="b" 
+            android:icon="@drawable/ic_menu_bookmark" />
+        <item android:id="@+id/history_tab_menu_id"
+            android:title="@string/history"
+            android:alphabeticShortcut="h" 
+            android:icon="@android:drawable/ic_menu_recent_history" />
+    </group>
+    <!-- these items are toggled in and out of @+id/stop_reload_menu_id -->
+    <item android:id="@+id/stop_menu_id"
+        android:title="@string/stop" 
+        android:icon="@*android:drawable/ic_menu_stop"
+        android:visible="false" />
+    <item android:id="@+id/reload_menu_id"
+        android:title="@string/reload" 
+        android:icon="@*android:drawable/ic_menu_refresh" 
+        android:visible="false" />
+</menu>
+ 
diff --git a/res/menu/browsercontext.xml b/res/menu/browsercontext.xml
new file mode 100644
index 0000000..8b2678e
--- /dev/null
+++ b/res/menu/browsercontext.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <group android:id="@+id/PHONE_MENU">
+        <item android:id="@+id/dial_context_menu_id"
+            android:title="@string/contextmenu_dial_dot"/>
+        <item android:id="@+id/add_contact_context_menu_id"
+            android:title="@string/contextmenu_add_contact"/>
+        <item android:id="@+id/copy_phone_context_menu_id"
+            android:title="@string/contextmenu_copy"/>
+    </group>
+    <group android:id="@+id/EMAIL_MENU">
+        <item android:id="@+id/email_context_menu_id"
+            android:title="@string/contextmenu_send_mail"/>
+        <item android:id="@+id/copy_mail_context_menu_id"
+            android:title="@string/contextmenu_copy"/>
+    </group>
+    <group android:id="@+id/GEO_MENU">
+        <item android:id="@+id/map_context_menu_id"
+            android:title="@string/contextmenu_map"/>
+        <item android:id="@+id/copy_geo_context_menu_id"
+            android:title="@string/contextmenu_copy"/>
+    </group>
+    <group android:id="@+id/ANCHOR_MENU">
+        <item android:id="@+id/open_context_menu_id"
+            android:title="@string/contextmenu_openlink"/>
+        <item android:id="@+id/open_newtab_context_menu_id"
+            android:title="@string/contextmenu_openlink_newwindow"/>
+        <item android:id="@+id/bookmark_context_menu_id"
+            android:title="@string/contextmenu_bookmark_thislink"/>
+        <item android:id="@+id/save_link_context_menu_id"
+            android:title="@string/contextmenu_savelink"/>
+        <item android:id="@+id/share_link_context_menu_id"
+            android:title="@string/contextmenu_sharelink"/>
+        <item android:id="@+id/copy_link_context_menu_id"
+            android:title="@string/contextmenu_copylink"/>
+    </group>
+    <group android:id="@+id/IMAGE_MENU">
+        <item android:id="@+id/download_context_menu_id"
+            android:title="@string/contextmenu_download_image"/>
+        <item android:id="@+id/view_image_context_menu_id"
+            android:title="@string/contextmenu_view_image"/>
+    </group>
+</menu>
+ 
diff --git a/res/menu/downloadhistory.xml b/res/menu/downloadhistory.xml
new file mode 100644
index 0000000..ee3b751
--- /dev/null
+++ b/res/menu/downloadhistory.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:id="@+id/download_menu_clear_all"
+        android:title="@string/download_menu_clear_all" 
+        android:icon="@*android:drawable/ic_menu_clear_playlist" />
+    <item android:id="@+id/download_menu_cancel_all"
+        android:title="@string/download_menu_cancel_all" 
+        android:icon="@android:drawable/ic_menu_close_clear_cancel" />
+
+</menu>
diff --git a/res/menu/downloadhistorycontextfailed.xml b/res/menu/downloadhistorycontextfailed.xml
new file mode 100644
index 0000000..f51b29a
--- /dev/null
+++ b/res/menu/downloadhistorycontextfailed.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:id="@+id/download_menu_clear"
+        android:title="@string/download_menu_clear" />
+
+</menu>
diff --git a/res/menu/downloadhistorycontextfinished.xml b/res/menu/downloadhistorycontextfinished.xml
new file mode 100644
index 0000000..2714b5b
--- /dev/null
+++ b/res/menu/downloadhistorycontextfinished.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:id="@+id/download_menu_open"
+        android:title="@string/download_menu_open" />
+    <item android:id="@+id/download_menu_clear"
+        android:title="@string/download_menu_clear" />
+
+</menu>
diff --git a/res/menu/downloadhistorycontextrunning.xml b/res/menu/downloadhistorycontextrunning.xml
new file mode 100644
index 0000000..552d0fa
--- /dev/null
+++ b/res/menu/downloadhistorycontextrunning.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:id="@+id/download_menu_cancel"
+        android:title="@string/download_menu_cancel" />
+
+</menu>
diff --git a/res/menu/history.xml b/res/menu/history.xml
new file mode 100644
index 0000000..3bb30a0
--- /dev/null
+++ b/res/menu/history.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/clear_history_menu_id"
+        android:title="@string/clear_history"
+        android:icon="@android:drawable/ic_menu_close_clear_cancel" />
+</menu>
diff --git a/res/menu/historycontext.xml b/res/menu/historycontext.xml
new file mode 100644
index 0000000..dfda010
--- /dev/null
+++ b/res/menu/historycontext.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/open_context_menu_id"
+        android:title="@string/contextmenu_openlink"/>
+    <item android:id="@+id/new_window_context_menu_id"
+        android:title="@string/contextmenu_openlink_newwindow"/>
+    <item android:id="@+id/save_to_bookmarks_menu_id"
+        android:title="@string/save_to_bookmarks"/>   
+    <item android:id="@+id/share_link_context_menu_id"
+        android:title="@string/contextmenu_sharelink"/>
+    <item android:id="@+id/copy_context_menu_id"
+        android:title="@string/contextmenu_copylink"/> 
+    <item android:id="@+id/delete_context_menu_id"
+        android:title="@string/remove_history_item"/> 
+</menu>
diff --git a/res/menu/tabscontext.xml b/res/menu/tabscontext.xml
new file mode 100644
index 0000000..e89720e
--- /dev/null
+++ b/res/menu/tabscontext.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/view_tab_menu_id"
+        android:title="@string/tab_picker_view_tab"/>
+    <item android:id="@+id/remove_tab_menu_id"
+        android:title="@string/tab_picker_remove_tab"/>
+    <item android:id="@+id/bookmark_tab_menu_id"
+        android:title="@string/tab_picker_bookmark"/>
+    <item android:id="@+id/properties_tab_menu_id"
+        android:title="@string/page_info"/>    
+</menu>