Updates to SWE browser's options menu

- Changed the contents of the menu
- Iconified frequently used items
- Changes to layout and menu animation
- Removed popup menu from History and Bookmarks page
-- Added buttons to these pages to replace menu items
- Updated icons used in popup menu
- Added menu option to save link to homepage
- Add bookmark icon color depicts if bookmark exists

Change-Id: I37226506737647367f71159f1a439cc3fca4ae03
diff --git a/src/com/android/browser/NavScreen.java b/src/com/android/browser/NavScreen.java
index b11cc4a..64243e3 100644
--- a/src/com/android/browser/NavScreen.java
+++ b/src/com/android/browser/NavScreen.java
@@ -80,12 +80,13 @@
     }
 
     protected void showMenu() {
-        PopupMenu popup = new PopupMenu(getContext(), mMore);
-        Menu menu = popup.getMenu();
-        popup.getMenuInflater().inflate(R.menu.browser, menu);
-        mUiController.updateMenuState(mUiController.getCurrentTab(), menu);
-        popup.setOnMenuItemClickListener(this);
-        popup.show();
+        if (mUiController instanceof Controller) {
+            PopupMenu popup = new PopupMenu(getContext(), mMore);
+            Menu menu = popup.getMenu();
+
+            Controller controller = (Controller) mUiController;
+            controller.onPrepareOptionsMenu(menu);
+        }
     }
 
     @Override