auto import from //branches/cupcake/...@130745
diff --git a/res/menu/browser.xml b/res/menu/browser.xml
index 21049d9..088fb6e 100644
--- a/res/menu/browser.xml
+++ b/res/menu/browser.xml
@@ -19,9 +19,6 @@
<item android:id="@+id/goto_menu_id"
android:title="@string/goto_dot"
android:alphabeticShortcut="l"
- android:icon="@*android:drawable/ic_menu_goto" />
- <item android:id="@+id/search_menu_id"
- android:title="@string/search"
android:icon="@android:drawable/ic_menu_search"/>
<item android:id="@+id/bookmarks_menu_id"
android:title="@string/bookmarks"
@@ -34,44 +31,40 @@
android:icon="@drawable/ic_menu_windows" />
<item android:id="@+id/stop_reload_menu_id"
android:alphabeticShortcut="r" />
- <item android:id="@+id/back_menu_id"
- android:title="@string/back"
- android:alphabeticShortcut="j"
- android:icon="@*android:drawable/ic_menu_back" />
- <item android:id="@+id/close_menu_id"
- android:title="@string/close"
- android:alphabeticShortcut="w"
- android:icon="@android:drawable/ic_menu_close_clear_cancel" />
<item android:id="@+id/forward_menu_id"
android:title="@string/forward"
- android:alphabeticShortcut="k" />
- <item android:id="@+id/homepage_menu_id"
- android:title="@string/homepage"
- android:alphabeticShortcut=" "
- android:icon="@*android:drawable/ic_menu_home" />
- <item android:id="@+id/classic_history_menu_id"
- android:icon="@android:drawable/ic_menu_recent_history"
- android:alphabeticShortcut="h"
- android:title="@string/history" />
- <item android:id="@+id/view_downloads_menu_id"
- android:title="@string/menu_view_download" />
+ 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" />
- <item android:id="@+id/bookmark_page_menu_id"
- android:title="@string/menu_bookmark_page"/>
+ 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/flip_orientation_menu_id"
- android:title="@string/menu_flip_orientation" />
- <item android:id="@+id/zoom_menu_id"
- android:title="@string/menu_zoom" />
+ <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: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=" " />
+ <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"
@@ -92,9 +85,6 @@
android:alphabeticShortcut="7" />
<item android:id="@+id/window_eight_menu_id"
android:alphabeticShortcut="8" />
- <item android:id="@+id/dump_nav_menu_id"
- android:title="@string/dump_nav"
- android:visible="false" />
</group>
<group android:id="@+id/TAB_MENU">
<item android:id="@+id/new_tab_menu_id"