Gello: update menu

- Bring back "close all other tabs"
- Group new tab, incognito and my navigation in one row

Change-Id: I79b805e411cc0835cdc5549d47967fd87a2a36bf
Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index d70f585..f6a9aa8 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -2117,6 +2117,10 @@
                 openIncognitoTab();
                 break;
 
+            case R.id.close_other_tabs_id:
+                closeOtherTabs();
+                break;
+
             case R.id.goto_menu_id:
                 editUrl();
                 break;
diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index da5b01c..9f56b12 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -196,6 +196,15 @@
             menu.setGroupEnabled(R.id.MAIN_SHORTCUT_MENU, false);
         }
 
+        MenuItem closeOthers = menu.findItem(R.id.close_other_tabs_id);
+        if (closeOthers != null) {
+            boolean isLastTab = true;
+            if (tab != null) {
+                isLastTab = (mTabControl.getTabCount() <= 1);
+            }
+            closeOthers.setVisible(!isLastTab);
+        }
+
     }
 
     @Override