From cbefb955773d889ca73ac933cd0ef2654b48dcb1 Mon Sep 17 00:00:00 2001
From: Dipti Nirmale <dnirm.moz@gmail.com>
Date: Fri, 9 Oct 2015 16:07:35 -0700
Subject: [PATCH] Bug 1140048 - Add 'send to device' and remove quick share
 item in toolbar menu. r=mcomella

--HG--
extra : commitid : 5uEroTeLbIF
extra : rebase_source : c524953b4bbcfb28f79880ba5a1c779359ecc79f
---
 .../menu-large-v11/browser_app_menu.xml          | 16 ++++++----------
 .../base/resources/menu-v11/browser_app_menu.xml | 16 ++++++----------
 .../menu-xlarge-v11/browser_app_menu.xml         | 16 ++++++----------
 .../base/resources/menu/browser_app_menu.xml     | 13 +++----------
 4 files changed, 21 insertions(+), 40 deletions(-)

diff --git a/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml b/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml
index cdc8e3545fe4..c1efcc56d4cf 100644
--- a/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml
+++ b/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml
@@ -34,19 +34,15 @@
           android:title="@string/overlay_share_reading_list_btn_label"
           android:showAsAction="ifRoom"/>
 
+    <item android:id="@+id/send_to_device"
+        android:icon="@drawable/overlay_send_tab_icon"
+        android:title="@string/overlay_share_send_other"
+        android:showAsAction="ifRoom"/>
+
     <item android:id="@+id/share"
           android:icon="@drawable/ic_menu_share"
           android:title="@string/share"
-          android:showAsAction="ifRoom"/>
-
-    <!-- We only show the quick share items so no need for an icon or title.
-
-         The visibility is changed dynamically for v14+ - hide for previous versions. -->
-    <item android:id="@+id/quickshare"
-          android:visible="false"
-          android:enabled="false"
-          android:visibility="gone"
-          android:showAsAction="collapseActionView"/>
+          android:showAsAction="ifRoom|withText"/>
 
     <item android:id="@+id/new_tab"
           android:title="@string/new_tab"/>
diff --git a/mobile/android/base/resources/menu-v11/browser_app_menu.xml b/mobile/android/base/resources/menu-v11/browser_app_menu.xml
index b99a7256692a..7ff125e449c9 100644
--- a/mobile/android/base/resources/menu-v11/browser_app_menu.xml
+++ b/mobile/android/base/resources/menu-v11/browser_app_menu.xml
@@ -34,19 +34,15 @@
           android:title="@string/overlay_share_reading_list_btn_label"
           android:showAsAction="ifRoom"/>
 
+    <item android:id="@+id/send_to_device"
+          android:icon="@drawable/overlay_send_tab_icon"
+          android:title="@string/overlay_share_send_other"
+          android:showAsAction="ifRoom"/>
+
     <item android:id="@+id/share"
           android:icon="@drawable/ic_menu_share"
           android:title="@string/share"
-          android:showAsAction="ifRoom"/>
-
-    <!-- We only show the quick share items so no need for an icon or title.
-
-         The visibility is changed dynamically for v14+ - hide for previous versions. -->
-    <item android:id="@+id/quickshare"
-          android:visible="false"
-          android:enabled="false"
-          android:visibility="gone"
-          android:showAsAction="collapseActionView"/>
+          android:showAsAction="ifRoom|withText"/>
 
     <item android:id="@+id/new_tab"
           android:title="@string/new_tab"/>
diff --git a/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml b/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml
index fd74c95cfacb..b26e116f10dd 100644
--- a/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml
+++ b/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml
@@ -34,19 +34,15 @@
           android:title="@string/overlay_share_reading_list_btn_label"
           android:showAsAction="ifRoom"/>
 
+    <item android:id="@+id/send_to_device"
+        android:icon="@drawable/overlay_send_tab_icon"
+        android:title="@string/overlay_share_send_other"
+        android:showAsAction="ifRoom"/>
+
     <item android:id="@+id/share"
           android:icon="@drawable/ic_menu_share"
           android:title="@string/share"
-          android:showAsAction="ifRoom"/>
-
-    <!-- We only show the quick share items so no need for an icon or title.
-
-         The visibility is changed dynamically for v14+ - hide for previous versions. -->
-    <item android:id="@+id/quickshare"
-          android:visible="false"
-          android:enabled="false"
-          android:visibility="gone"
-          android:showAsAction="collapseActionView"/>
+          android:showAsAction="ifRoom|withText"/>
 
     <item android:id="@+id/new_tab"
           android:title="@string/new_tab"/>
diff --git a/mobile/android/base/resources/menu/browser_app_menu.xml b/mobile/android/base/resources/menu/browser_app_menu.xml
index fd1aed745ce7..22c8a601f03b 100644
--- a/mobile/android/base/resources/menu/browser_app_menu.xml
+++ b/mobile/android/base/resources/menu/browser_app_menu.xml
@@ -30,6 +30,9 @@
           android:icon="@drawable/ic_menu_new_private_tab"
           android:title="@string/new_private_tab"/>
 
+    <item android:id="@+id/send_to_device"
+          android:title="@string/overlay_share_send_other"/>
+
     <item android:id="@+id/share"
           android:title="@string/share" />
 
@@ -77,16 +80,6 @@
           android:visible="false"
           android:title="@string/exit_guest_session"/>
 
-    <!-- Android will eliminate v11+ resource files from pre-11 builds.
-         Those files are the only place in which certain IDs are defined.
-         This causes compilation errors.
-         To avoid nasty code workarounds, we define stub IDs here, but
-         hide the menu entries. -->
-
-    <item android:id="@+id/quickshare"
-          android:visible="false"
-          android:enabled="false" />
-
     <item android:id="@+id/page"
           android:visible="false"
           android:enabled="false"