commit 49b7925ec66faf5015fdd1862eada2978ddd5fde
author Pankaj Garg <pgarg@codeaurora.org> Fri Nov 07 17:33:41 2014 -0800
committer WebTech Code Review <code-review@localhost> Wed Nov 26 10:30:10 2014 -0800
tree e43ee53fe74f629317c2dd5e5702e8a5f496178a
parent aa42e9f7002450bb759d9bc5e2540deb88b97fa1

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

src/com/android/browser/PhoneUi.java

diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index a2799b3..ca478c2 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -160,42 +160,32 @@
         return true;
     }
 
+    private void setMenuItemVisibility(Menu menu, int id,
+                                       boolean visibility) {
+        MenuItem item = menu.findItem(id);
+        if (item != null) {
+            item.setVisible(visibility);
+        }
+    }
+
     @Override
     public void updateMenuState(Tab tab, Menu menu) {
         MenuItem bm = menu.findItem(R.id.bookmarks_menu_id);
         if (bm != null) {
             bm.setVisible(!showingNavScreen());
         }
-        MenuItem abm = menu.findItem(R.id.add_bookmark_menu_id);
-        if (abm != null) {
-            abm.setVisible((tab != null) && !tab.isSnapshot() && !showingNavScreen());
-        }
         MenuItem info = menu.findItem(R.id.page_info_menu_id);
         if (info != null) {
             info.setVisible(false);
         }
-        MenuItem newtab = menu.findItem(R.id.new_tab_menu_id);
-        if (newtab != null) {
-            newtab.setVisible(false);
-        }
-        MenuItem incognito = menu.findItem(R.id.incognito_menu_id);
-        if (incognito != null) {
-            incognito.setVisible(showingNavScreen());
-        }
-        MenuItem closeOthers = menu.findItem(R.id.close_other_tabs_id);
-        if (closeOthers != null) {
-            boolean isLastTab = true;
-            if (tab != null) {
-                isLastTab = (mTabControl.getTabCount() <= 1);
-            }
-            closeOthers.setEnabled(!isLastTab);
-        }
+
         if (showingNavScreen()) {
+            setMenuItemVisibility(menu, R.id.history_menu_id, false);
+            setMenuItemVisibility(menu, R.id.find_menu_id, false);
             menu.setGroupVisible(R.id.LIVE_MENU, false);
-            menu.setGroupVisible(R.id.OFFLINE_READING, false);
+            setMenuItemVisibility(menu, R.id.save_snapshot_menu_id, false);
             menu.setGroupVisible(R.id.SNAPSHOT_MENU, false);
             menu.setGroupVisible(R.id.NAV_MENU, false);
-            menu.setGroupVisible(R.id.COMBO_MENU, true);
         }
     }