From db51f63913e05904206cbab08fd61562eaa55ffc Mon Sep 17 00:00:00 2001
From: jrizzoli <joey@cyanogenmoditalia.it>
Date: Tue, 22 Mar 2016 15:57:18 +0100
Subject: 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>
---
 res/drawable/ic_action_add_incognito.xml           |  2 +-
 .../ic_action_history_forward_disabled.xml         |  2 +-
 res/drawable/ic_action_more.xml                    | 11 +++++++
 res/drawable/ic_action_mynav.xml                   | 14 +++++++++
 res/menu/browser.xml                               | 34 +++++++++++++++-------
 res/values/colors.xml                              |  1 +
 src/com/android/browser/Controller.java            |  4 +++
 src/com/android/browser/PhoneUi.java               |  9 ++++++
 8 files changed, 65 insertions(+), 12 deletions(-)
 create mode 100644 res/drawable/ic_action_more.xml
 create mode 100644 res/drawable/ic_action_mynav.xml

diff --git a/res/drawable/ic_action_add_incognito.xml b/res/drawable/ic_action_add_incognito.xml
index a4ecc598..c5abfde3 100644
--- a/res/drawable/ic_action_add_incognito.xml
+++ b/res/drawable/ic_action_add_incognito.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/icon_white"
+        android:fillColor="@color/icon_black"
         android:pathData="M12,3 C9.31,3,7.41,4.22,7.41,4.22 L6,9 L18,9 L16.59,4.22
 C16.59,4.22,14.69,3,12,3 M12,11 C9.27,11,5.39,11.54,5.13,11.59
 C4.09,11.87,3.25,12.15,2.59,12.41 C1.58,12.75,1,13,1,13 L23,13
diff --git a/res/drawable/ic_action_history_forward_disabled.xml b/res/drawable/ic_action_history_forward_disabled.xml
index 839473a0..0f9b77f9 100644
--- a/res/drawable/ic_action_history_forward_disabled.xml
+++ b/res/drawable/ic_action_history_forward_disabled.xml
@@ -6,6 +6,6 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/grey"
+        android:fillColor="@color/icon_disabled"
         android:pathData="M12 4l-1.41 1.41L16.17 11H4v2h12.17l-5.58 5.59L12 20l8-8z" />
 </vector>
diff --git a/res/drawable/ic_action_more.xml b/res/drawable/ic_action_more.xml
new file mode 100644
index 00000000..103cf56b
--- /dev/null
+++ b/res/drawable/ic_action_more.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/icon_black"
+        android:pathData="M16.59,8.59 L12,13.17 L7.41,8.59 L6,10 L12,16 L18,10 Z" />
+</vector>
diff --git a/res/drawable/ic_action_mynav.xml b/res/drawable/ic_action_mynav.xml
new file mode 100644
index 00000000..27f7f3d2
--- /dev/null
+++ b/res/drawable/ic_action_mynav.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/icon_black"
+        android:pathData="M13,12 L20,12 L20,13.5 L13,13.5 Z M13,9.5 L20,9.5 L20,11 L13,11 Z M13,14.5
+L20,14.5 L20,16 L13,16 Z M21,4 L3,4 C1.9,4,1,4.9,1,6 L1,19 C1,20.1,1.9,21,3,21
+L21,21 C22.1,21,23,20.1,23,19 L23,6 C23,4.9,22.1,4,21,4 Z M21,19 L12,19 L12,6
+L21,6 L21,19 Z" />
+</vector>
diff --git a/res/menu/browser.xml b/res/menu/browser.xml
index 732d51e7..6ffbc832 100644
--- a/res/menu/browser.xml
+++ b/res/menu/browser.xml
@@ -40,20 +40,38 @@
             </item>
         </group>
 
-        <item
-            android:id="@+id/new_tab_menu_id"
-            android:title="@string/new_tab" />
-        <item
-            android:id="@+id/incognito_menu_id"
-            android:title="@string/new_incognito_tab" />
+        <item>
+            <menu>
+                <item
+                    android:id="@+id/new_tab_menu_id"
+                    android:icon="@drawable/ic_action_add_tab"
+                    android:title="@string/new_tab" />
+
+                <item
+                    android:id="@+id/incognito_menu_id"
+                    android:icon="@drawable/ic_action_add_incognito"
+                    android:title="@string/new_incognito_tab" />
+
+                <item
+                    android:id="@+id/bookmarks_menu_id"
+                    android:icon="@drawable/ic_action_mynav"
+                    android:title="@string/mystuffs" />
+            </menu>
+        </item>
+
         <item
             android:id="@+id/snapshots_menu_id"
             android:title="@string/tab_snapshots"
             android:visible="false" />
+
         <item
             android:id="@+id/find_menu_id"
             android:title="@string/find_on_page"/>
 
+        <item
+            android:id="@+id/close_other_tabs_id"
+            android:title="@string/close_other_tabs"/>
+
         <group
             android:id="@+id/LIVE_MENU">
             <item
@@ -78,10 +96,6 @@
                 android:title="@string/add_to_homescreen" />
         </group>
 
-        <item
-            android:id="@+id/bookmarks_menu_id"
-            android:title="@string/mystuffs" />
-
         <group
             android:id="@+id/SNAPSHOT_MENU"
             android:visible="false">
diff --git a/res/values/colors.xml b/res/values/colors.xml
index a9cb524a..b782dfcc 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -48,6 +48,7 @@
     <color name="mynav_accent">#009688</color>
     <color name="floating_action_button_touch_tint_mynav">#00796B</color>
 
+    <color name="icon_disabled">#b3b3b3</color>
 
     <!-- derived colors -->
     <color name="NavigationBarBackground">@color/primary</color>
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index d70f5856..f6a9aa8b 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -2117,6 +2117,10 @@ public class Controller
                 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 da5b01c9..9f56b12e 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -196,6 +196,15 @@ public class PhoneUi extends BaseUi {
             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
-- 
cgit v1.2.3