Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backout 21a070f6afcd for Android bustage

Browse Source
This commit is contained in:
Brian Nicholson 2012-06-26 18:07:13 -07:00
parent c30b5f4919
commit 3e70cba3aa
4 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mobile/android/chrome/content/aboutApps.js
View File

@ -44,7 +44,7 @@ function onLoad(aEvent) {
AppsUI.shortcut = contextmenus.add(gStrings.GetStringFromName("appsContext.shortcut"), contextmenus.SelectorContext("div[mozApp]"),
function(aTarget) {
let manifest = aTarget.manifest;
gChromeWin.WebappsUI.createShortcut(manifest.name, manifest.fullLaunchPath(), gChromeWin.WebappsUI.getBiggestIcon(manifest.icons), "webapp");
gChromeWin.WebappsUI.createShortcut(manifest.name, manifest.fullLaunchPath(), manifest.iconURLForSize("64"), "webapp");
});
AppsUI.uninstall = contextmenus.add(gStrings.GetStringFromName("appsContext.uninstall"), contextmenus.SelectorContext("div[mozApp]"),
function(aTarget) {
@ -97,7 +97,7 @@ function addApplication(aApp) {
container.setAttribute("title", manifest.name);
let img = document.createElement("img");
img.src = gChromeWin.WebappsUI.getBiggestIcon(manifest.icons);
img.src = manifest.iconURLForSize("64");
img.setAttribute("title", manifest.name);
let title = document.createElement("div");

13
mobile/android/chrome/content/browser.js
View File

@ -5704,7 +5704,7 @@ var WebappsUI = {
// Add a homescreen shortcut -- we can't use createShortcut, since we need to pass
// a unique ID for Android webapp allocation
this.makeBase64Icon(this.getBiggestIcon(manifest.icons),
this.makeBase64Icon(manifest.iconURLForSize("64"),
function(icon) {
sendMessageToJava({
gecko: {
@ -5740,18 +5740,7 @@ var WebappsUI = {
break;
}
},
getBiggestIcon: function getBiggestIcon(aIcons) {
if (!aIcons)
return "chrome://browser/skin/images/default-app-icon.png";
let iconSizes = Object.keys(aIcons);
if (iconSizes.length == 0)
return "chrome://browser/skin/images/default-app-icon.png";
iconSizes.sort(function(a, b) a - b);
return aIcons[iconSizes.pop()];
}
doInstall: function doInstall(aData) {
let manifest = new DOMApplicationManifest(aData.app.manifest, aData.app.origin);
let name = manifest.name ? manifest.name : manifest.fullLaunchPath();

BIN
mobile/android/themes/core/images/default-app-icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.9 KiB

1
mobile/android/themes/core/jar.mn
View File

@ -32,7 +32,6 @@ chrome.jar:
skin/images/checkbox_unchecked.png (images/checkbox_unchecked.png)
skin/images/checkbox_unchecked_disabled.png (images/checkbox_unchecked_disabled.png)
skin/images/checkbox_unchecked_pressed.png (images/checkbox_unchecked_pressed.png)
skin/images/default-app-icon.png (images/default-app-icon.png)
skin/images/dropmarker.svg (images/dropmarker.svg)
skin/images/errorpage-warning.png (images/errorpage-warning.png)
skin/images/errorpage-warning.png (images/errorpage-warning.png)