WIP:
Bug 1314902 - Replace ic_menu_share with (VectorDrawable) as_share
The icons look slightly different, this will need some UX review.
MozReview-Commit-ID: 33bhcDIOH5v
deleted file mode 100644
index 66a0ad1983cf4823a1dd1d565a6495b00cd09b7c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 31cca8e157433f0e0b705da5cd02282fc32e70a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index de6f092ee398595758825701e8f90e487e168bab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/mobile/android/base/resources/menu-large/browser_app_menu.xml
+++ b/mobile/android/base/resources/menu-large/browser_app_menu.xml
@@ -25,17 +25,17 @@
android:visible="false"/>
<item android:id="@+id/bookmark"
android:icon="@drawable/ic_menu_bookmark_add"
android:title="@string/bookmark"
android:showAsAction="ifRoom"/>
<item android:id="@+id/share"
- android:icon="@drawable/ic_menu_share"
+ android:icon="@drawable/as_share"
android:title="@string/share"
android:showAsAction="ifRoom"/>
<item android:id="@+id/new_tab"
android:title="@string/new_tab"/>
<item android:id="@+id/new_private_tab"
android:title="@string/new_private_tab"/>
--- a/mobile/android/base/resources/menu-xlarge/browser_app_menu.xml
+++ b/mobile/android/base/resources/menu-xlarge/browser_app_menu.xml
@@ -25,17 +25,17 @@
android:visible="false"/>
<item android:id="@+id/bookmark"
android:icon="@drawable/ic_menu_bookmark_add"
android:title="@string/bookmark"
android:showAsAction="always"/>
<item android:id="@+id/share"
- android:icon="@drawable/ic_menu_share"
+ android:icon="@drawable/as_share"
android:title="@string/share"
android:showAsAction="ifRoom"/>
<item android:id="@+id/new_tab"
android:title="@string/new_tab"/>
<item android:id="@+id/new_private_tab"
android:title="@string/new_private_tab"/>
--- a/mobile/android/base/resources/menu/browser_app_menu.xml
+++ b/mobile/android/base/resources/menu/browser_app_menu.xml
@@ -25,17 +25,17 @@
android:showAsAction="always"/>
<item android:id="@+id/reload"
android:icon="@drawable/ic_menu_reload"
android:title="@string/reload"
android:showAsAction="always"/>
<item android:id="@+id/share"
- android:icon="@drawable/ic_menu_share"
+ android:icon="@drawable/as_share"
android:title="@string/share"
android:showAsAction="ifRoom"/>
<item android:id="@+id/new_tab"
android:title="@string/new_tab"/>
<item android:id="@+id/new_private_tab"
android:title="@string/new_private_tab"/>
--- a/mobile/android/chrome/content/ActionBarHandler.js
+++ b/mobile/android/chrome/content/ActionBarHandler.js
@@ -571,17 +571,17 @@ var ActionBarHandler = {
}
});
},
},
SHARE: {
id: "share_action",
label: Strings.browser.GetStringFromName("contextmenu.share"),
- icon: "drawable://ic_menu_share",
+ icon: "drawable://as_share",
order: 0,
floatingOrder: 4,
selector: {
matches: function(element, win) {
if (!ParentalControls.isAllowed(ParentalControls.SHARE)) {
return false;
}
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -662,17 +662,17 @@ var BrowserApp = {
order: NativeWindow.contextmenus.DEFAULT_HTML5_ORDER - 1, // Show above HTML5 menu items
selector: NativeWindow.contextmenus._disableRestricted("SHARE", NativeWindow.contextmenus.linkShareableContext),
showAsActions: function(aElement) {
return {
title: aElement.textContent.trim() || aElement.title.trim(),
uri: NativeWindow.contextmenus._getLinkURL(aElement),
};
},
- icon: "drawable://ic_menu_share",
+ icon: "drawable://as_share",
callback: function(aTarget) {
// share.1 telemetry is handled in Java via PromptList
UITelemetry.addEvent("action.1", "contextmenu", null, "web_share_link");
}
});
NativeWindow.contextmenus.add({
label: stringGetter("contextmenu.shareEmailAddress"),
@@ -682,17 +682,17 @@ var BrowserApp = {
let url = NativeWindow.contextmenus._getLinkURL(aElement);
let emailAddr = NativeWindow.contextmenus._stripScheme(url);
let title = aElement.textContent || aElement.title;
return {
title: title,
uri: emailAddr,
};
},
- icon: "drawable://ic_menu_share",
+ icon: "drawable://as_share",
callback: function(aTarget) {
// share.1 telemetry is handled in Java via PromptList
UITelemetry.addEvent("action.1", "contextmenu", null, "web_share_email");
}
});
NativeWindow.contextmenus.add({
label: stringGetter("contextmenu.sharePhoneNumber"),
@@ -702,17 +702,17 @@ var BrowserApp = {
let url = NativeWindow.contextmenus._getLinkURL(aElement);
let phoneNumber = NativeWindow.contextmenus._stripScheme(url);
let title = aElement.textContent || aElement.title;
return {
title: title,
uri: phoneNumber,
};
},
- icon: "drawable://ic_menu_share",
+ icon: "drawable://as_share",
callback: function(aTarget) {
// share.1 telemetry is handled in Java via PromptList
UITelemetry.addEvent("action.1", "contextmenu", null, "web_share_phone");
}
});
NativeWindow.contextmenus.add(stringGetter("contextmenu.addToContacts"),
NativeWindow.contextmenus._disableRestricted("ADD_CONTACT", NativeWindow.contextmenus.emailLinkContext),
@@ -783,17 +783,17 @@ var BrowserApp = {
let url = (aElement.currentSrc || aElement.src);
let title = aElement.textContent || aElement.title;
return {
title: title,
uri: url,
type: "video/*",
};
},
- icon: "drawable://ic_menu_share",
+ icon: "drawable://as_share",
callback: function(aTarget) {
// share.1 telemetry is handled in Java via PromptList
UITelemetry.addEvent("action.1", "contextmenu", null, "web_share_media");
}
});
NativeWindow.contextmenus.add(stringGetter("contextmenu.fullScreen"),
NativeWindow.contextmenus.videoContext("not-fullscreen"),
@@ -848,17 +848,17 @@ var BrowserApp = {
let props = imageCache.findEntryProperties(aTarget.currentURI, doc);
let src = aTarget.src;
return {
title: src,
uri: src,
type: "image/*",
};
},
- icon: "drawable://ic_menu_share",
+ icon: "drawable://as_share",
menu: true,
callback: function(aTarget) {
UITelemetry.addEvent("action.1", "contextmenu", null, "web_share_image");
}
});
NativeWindow.contextmenus.add(stringGetter("contextmenu.saveImage"),
NativeWindow.contextmenus.imageSaveableContext,