wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Back out 47afa45afdfb and ccb20a1169f1 (bug 697309) and c30bdfd14362 and 618b680315ee (bug 736278) for Android native Talos bustage

Browse Source
This commit is contained in:
Phil Ringnalda 2012-03-28 00:09:25 -07:00
parent 8825a7244b
commit dc49de08a7
19 changed files with 24 additions and 435 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mobile/android/app/mobile.js
View File

@ -485,7 +485,6 @@ pref("app.faqURL", "http://www.mozilla.com/%LOCALE%/mobile/beta/faq/");
pref("app.featuresURL", "http://www.mozilla.com/%LOCALE%/mobile/features/");
pref("app.faqURL", "http://www.mozilla.com/%LOCALE%/mobile/faq/");
#endif
pref("app.marketplaceURL", "https://marketplace.mozilla.org/");
// Name of alternate about: page for certificate errors (when undefined, defaults to about:neterror)
pref("security.alternate_certificate_error_page", "certerror");

27
mobile/android/base/DoorHanger.java
View File

@ -43,11 +43,9 @@ import android.text.SpannableString;
import android.text.method.LinkMovementMethod;
import android.text.style.ForegroundColorSpan;
import android.text.style.URLSpan;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.LinearLayout;
import android.widget.TextView;
@ -55,8 +53,6 @@ import org.json.JSONObject;
import org.json.JSONException;
public class DoorHanger extends LinearLayout implements Button.OnClickListener {
private static final String LOGTAG = "DoorHanger";
private Context mContext;
private LinearLayout mChoicesLayout;
private TextView mTextView;
@ -65,9 +61,6 @@ public class DoorHanger extends LinearLayout implements Button.OnClickListener {
// value used to identify the notification
private String mValue;
// Optional checkbox added underneath message text
private CheckBox mCheckBox;
static private LayoutInflater mInflater;
private int mPersistence = 0;
@ -106,18 +99,7 @@ public class DoorHanger extends LinearLayout implements Button.OnClickListener {
}
public void onClick(View v) {
JSONObject response = new JSONObject();
try {
response.put("callback", v.getTag().toString());
// If the checkbox is being used, pass its value
if (mCheckBox != null)
response.put("checked", mCheckBox.isChecked());
} catch (JSONException ex) {
Log.e(LOGTAG, "Error creating onClick response: " + ex);
}
GeckoEvent e = GeckoEvent.createBroadcastEvent("Doorhanger:Reply", response.toString());
GeckoEvent e = GeckoEvent.createBroadcastEvent("Doorhanger:Reply", v.getTag().toString());
GeckoAppShell.sendEventToGecko(e);
mTab.removeDoorHanger(mValue);
@ -184,13 +166,6 @@ public class DoorHanger extends LinearLayout implements Button.OnClickListener {
mTextView.setText(titleWithLink);
mTextView.setMovementMethod(LinkMovementMethod.getInstance());
} catch (JSONException e) { }
try {
String checkBoxText = options.getString("checkbox");
mCheckBox = (CheckBox) findViewById(R.id.doorhanger_checkbox);
mCheckBox.setText(checkBoxText);
mCheckBox.setVisibility(VISIBLE);
} catch (JSONException e) { }
}
// This method checks with persistence and timeout options to see if

6
mobile/android/base/resources/layout/doorhanger.xml
View File

@ -9,12 +9,6 @@
android:textColorLink="@color/doorhanger_link"
android:padding="10dp"/>
<CheckBox android:id="@+id/doorhanger_checkbox"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:checked="true"
android:visibility="gone"/>
<LinearLayout android:id="@+id/doorhanger_choices"
style="@android:style/ButtonBar"
android:layout_width="fill_parent"

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

@ -1,160 +0,0 @@
/* ***** BEGIN LICENSE BLOCK *****
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/.
*
* ***** END LICENSE BLOCK ***** */
let Ci = Components.interfaces, Cc = Components.classes, Cu = Components.utils;
Cu.import("resource://gre/modules/Services.jsm")
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Webapps.jsm");
let gStrings = Services.strings.createBundle("chrome://browser/locale/aboutApps.properties");
XPCOMUtils.defineLazyGetter(window, "gChromeWin", function()
window.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIWebNavigation)
.QueryInterface(Ci.nsIDocShellTreeItem)
.rootTreeItem
.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindow)
.QueryInterface(Ci.nsIDOMChromeWindow));
var AppsUI = {
uninstall: null,
shortcut: null
};
function onLoad(aEvent) {
try {
let formatter = Cc["@mozilla.org/toolkit/URLFormatterService;1"].getService(Ci.nsIURLFormatter);
let link = document.getElementById("marketplaceURL");
let url = formatter.formatURLPref(link.getAttribute("pref"));
link.setAttribute("href", url);
} catch (e) {}
navigator.mozApps.mgmt.oninstall = onInstall;
navigator.mozApps.mgmt.onuninstall = onUninstall;
updateList();
let contextmenus = gChromeWin.NativeWindow.contextmenus;
AppsUI.shortcut = contextmenus.add(gStrings.GetStringFromName("appsContext.shortcut"), contextmenus.SelectorContext("div[mozApp]"),
function(aTarget) {
let manifest = aTarget.manifest;
createShortcut(manifest.name, manifest.fullLaunchPath(), manifest.iconURLForSize("64"), "webapp");
});
AppsUI.uninstall = contextmenus.add(gStrings.GetStringFromName("appsContext.uninstall"), contextmenus.SelectorContext("div[mozApp]"),
function(aTarget) {
aTarget.app.uninstall();
});
}
function onUnload(aEvent) {
let contextmenus = gChromeWin.NativeWindow.contextmenus;
if (AppsUI.shortcut)
contextmenus.remove(AppsUI.shortcut);
if (AppsUI.uninstall)
contextmenus.remove(AppsUI.uninstall);
}
function updateList() {
let grid = document.getElementById("appgrid");
while (grid.lastChild) {
grid.removeChild(grid.lastChild);
}
let request = navigator.mozApps.mgmt.getAll();
request.onsuccess = function() {
for (let i = 0; i < request.result.length; i++)
addApplication(request.result[i]);
if (!request.result.length)
document.getElementById("noapps").className = "";
}
}
function addApplication(aApp) {
let list = document.getElementById("appgrid");
let manifest = new DOMApplicationManifest(aApp.manifest, aApp.origin);
let container = document.createElement("div");
container.className = "app";
container.setAttribute("id", "app-" + aApp.origin);
container.setAttribute("mozApp", aApp.origin);
container.setAttribute("title", manifest.name);
let img = document.createElement("img");
img.src = manifest.iconURLForSize("64");
img.setAttribute("title", manifest.name);
let title = document.createElement("div");
title.appendChild(document.createTextNode(manifest.name));
container.appendChild(img);
container.appendChild(title);
list.appendChild(container);
container.addEventListener("click", function(aEvent) {
aApp.launch();
}, false);
container.app = aApp;
container.manifest = manifest;
}
function onInstall(aEvent) {
let node = document.getElementById("app-" + aEvent.application.origin);
if (node)
return;
addApplication(aEvent.application);
document.getElementById("noapps").className = "hidden";
}
function onUninstall(aEvent) {
let node = document.getElementById("app-" + aEvent.application.origin);
if (node) {
let parent = node.parentNode;
parent.removeChild(node);
if (!parent.firstChild)
document.getElementById("noapps").className = "";
}
}
function createShortcut(aTitle, aURL, aIconURL, aType) {
// The background images are 72px, but Android will resize as needed.
// Bigger is better than too small.
const kIconSize = 72;
const kOverlaySize = 32;
const kOffset = 20;
let canvas = document.createElement("canvas");
function _createShortcut() {
let icon = canvas.toDataURL("image/png", "");
canvas = null;
try {
let shell = Cc["@mozilla.org/browser/shell-service;1"].createInstance(Ci.nsIShellService);
shell.createShortcut(aTitle, aURL, icon, aType);
} catch(e) {
Cu.reportError(e);
}
}
canvas.width = canvas.height = kIconSize;
let ctx = canvas.getContext("2d");
let favicon = new Image();
favicon.onload = function() {
// Center the favicon and overlay it on the background
ctx.drawImage(favicon, kOffset, kOffset, kOverlaySize, kOverlaySize);
_createShortcut();
}
favicon.onerror = function() {
Cu.reportError("CreateShortcut: favicon image load error");
}
favicon.src = aIconURL;
}

46
mobile/android/chrome/content/aboutApps.xhtml
View File

@ -1,46 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
# ***** BEGIN LICENSE BLOCK *****
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.
#
# ***** END LICENSE BLOCK *****
<!DOCTYPE html [
<!ENTITY % htmlDTD
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"DTD/xhtml1-strict.dtd">
%htmlDTD;
<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
%globalDTD;
<!ENTITY % aboutAppsDTD SYSTEM "chrome://browser/locale/aboutApps.dtd">
%aboutAppsDTD;
<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd" >
%browserDTD;
]>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>&aboutApps.title;</title>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
<link rel="icon" type="image/png" href="chrome://branding/content/favicon32.png" />
<link rel="stylesheet" type="text/css" href="chrome://browser/skin/aboutApps.css" media="all" />
<script type="text/javascript;version=1.8" src="chrome://browser/content/aboutApps.js"></script>
</head>
<body dir="&locale.dir;" onload="onLoad(event)" onunload="onUnload(event)">
<div id="main-container">
<div>&aboutApps.title;</div>
<div id="noapps" class="hidden">
&aboutApps.noApps.pre;<a id="marketplaceURL" pref="app.marketplaceURL">&aboutApps.noApps.middle;</a>&aboutApps.noApps.post;
</div>
<div>
<div class="spacer" id="spacer1"> </div>
<div id="appgrid"/>
<div class="spacer" id="spacer1"> </div>
</div>
</div>
</body>
</html>

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

@ -236,7 +236,6 @@ var BrowserApp = {
CharacterEncoding.init();
SearchEngines.init();
ActivityObserver.init();
WebappsUI.init();
// Init LoginManager
Cc["@mozilla.org/login-manager;1"].getService(Ci.nsILoginManager);
@ -416,7 +415,6 @@ var BrowserApp = {
ConsoleAPI.uninit();
CharacterEncoding.uninit();
SearchEngines.uninit();
WebappsUI.uninit();
},
// This function returns false during periods where the browser displayed document is
@ -1074,15 +1072,10 @@ var NativeWindow = {
if (this.menu._callbacks[aData])
this.menu._callbacks[aData]();
} else if (aTopic == "Doorhanger:Reply") {
let data = JSON.parse(aData);
let reply_id = data["callback"];
let reply_id = aData;
if (this.doorhanger._callbacks[reply_id]) {
// Pass the value of the optional checkbox to the callback
let checked = data["checked"];
this.doorhanger._callbacks[reply_id].cb(checked);
let prompt = this.doorhanger._callbacks[reply_id].prompt;
this.doorhanger._callbacks[reply_id].cb();
for (let id in this.doorhanger._callbacks) {
if (this.doorhanger._callbacks[id].prompt == prompt) {
delete this.doorhanger._callbacks[id];
@ -1286,9 +1279,7 @@ var NativeWindow = {
let popupNode = aEvent.originalTarget;
let title = "";
if (popupNode.hasAttribute("title")) {
title = popupNode.getAttribute("title")
} else if ((popupNode instanceof Ci.nsIDOMHTMLAnchorElement && popupNode.href) ||
if ((popupNode instanceof Ci.nsIDOMHTMLAnchorElement && popupNode.href) ||
(popupNode instanceof Ci.nsIDOMHTMLAreaElement && popupNode.href)) {
title = this._getLinkURL(popupNode);
} else if (popupNode instanceof Ci.nsIImageLoadingContent && popupNode.currentURI) {
@ -3914,50 +3905,22 @@ var ClipboardHelper = {
var PluginHelper = {
showDoorHanger: function(aTab) {
if (!aTab.browser)
return;
let uri = aTab.browser.currentURI;
// If the user has previously set a plugins permission for this website,
// either play or don't play the plugins instead of showing a doorhanger.
let permValue = Services.perms.testPermission(uri, "plugins");
if (permValue != Services.perms.UNKNOWN_ACTION) {
if (permValue == Services.perms.ALLOW_ACTION)
PluginHelper.playAllPlugins(aTab);
return;
}
let message = Strings.browser.formatStringFromName("clickToPlayPlugins.message1",
[uri.host], 1);
let message = Strings.browser.GetStringFromName("clickToPlayPlugins.message");
let buttons = [
{
label: Strings.browser.GetStringFromName("clickToPlayPlugins.yes"),
callback: function(aChecked) {
// If the user checked "Don't ask again", make a permanent exception
if (aChecked)
Services.perms.add(uri, "plugins", Ci.nsIPermissionManager.ALLOW_ACTION);
callback: function() {
PluginHelper.playAllPlugins(aTab);
}
},
{
label: Strings.browser.GetStringFromName("clickToPlayPlugins.no"),
callback: function(aChecked) {
// If the user checked "Don't ask again", make a permanent exception
if (aChecked)
Services.perms.add(uri, "plugins", Ci.nsIPermissionManager.DENY_ACTION);
// Other than that, do nothing
callback: function() {
// Do nothing
}
}
];
// Add a checkbox with a "Don't ask again" message
let options = { checkbox: Strings.browser.GetStringFromName("clickToPlayPlugins.dontAskAgain") };
NativeWindow.doorhanger.show(message, "ask-to-play-plugins", buttons, aTab.id, options);
]
NativeWindow.doorhanger.show(message, "ask-to-play-plugins", buttons, aTab.id);
},
playAllPlugins: function(aTab, aEvent) {
@ -4039,7 +4002,7 @@ var PluginHelper = {
var PermissionsHelper = {
_permissonTypes: ["password", "geolocation", "popup", "indexedDB",
"offline-app", "desktop-notification", "plugins"],
"offline-app", "desktop-notification"],
_permissionStrings: {
"password": {
label: "password.rememberPassword",
@ -4070,11 +4033,6 @@ var PermissionsHelper = {
label: "desktopNotification.useNotifications",
allowed: "desktopNotification.allow",
denied: "desktopNotification.dontAllow"
},
"plugins": {
label: "clickToPlayPlugins.playPlugins",
allowed: "clickToPlayPlugins.yes",
denied: "clickToPlayPlugins.no"
}
},

1
mobile/android/chrome/content/browser.xul
View File

@ -9,7 +9,6 @@
<script type="application/javascript" src="chrome://browser/content/downloads.js"/>
<script type="application/javascript" src="chrome://browser/content/exceptions.js"/>
<script type="application/javascript" src="chrome://browser/content/sanitize.js"/>
<script type="application/javascript" src="chrome://browser/content/webapps.js"/>
<deck id="browsers" flex="1"/>

65
mobile/android/chrome/content/webapps.js
View File

@ -1,65 +0,0 @@
/* ***** BEGIN LICENSE BLOCK *****
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/.
*
* ***** END LICENSE BLOCK ***** */
Cu.import("resource://gre/modules/Webapps.jsm");
let WebappsUI = {
init: function() {
Services.obs.addObserver(this, "webapps-ask-install", false);
Services.obs.addObserver(this, "webapps-launch", false);
},
uninit: function() {
Services.obs.removeObserver(this, "webapps-ask-install");
Services.obs.removeObserver(this, "webapps-launch");
},
observe: function(aSubject, aTopic, aData) {
let data = JSON.parse(aData);
switch (aTopic) {
case "webapps-ask-install":
this.doInstall(data);
break;
case "webapps-launch":
DOMApplicationRegistry.getManifestFor(data.origin, (function(aManifest) {
if (!aManifest)
return;
let manifest = new DOMApplicationManifest(aManifest, data.origin);
this.openURL(manifest.fullLaunchPath(), data.origin);
}).bind(this));
break;
}
},
doInstall: function(aData) {
let manifest = new DOMApplicationManifest(aData.app.manifest, aData.app.origin);
let checkbox = { value: false };
let name = manifest.name ? manifest.name : manifest.fullLaunchPath();
if (Services.prompt.confirm(null, Strings.browser.GetStringFromName("webapps.installTitle"), name))
DOMApplicationRegistry.confirmInstall(aData);
},
openURL: function(aURI, aOrigin) {
let ss = Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionStore);
let tabs = BrowserApp.tabs;
let tab = null;
for (let i = 0; i < tabs.length; i++) {
let appOrigin = ss.getTabValue(tabs[i], "appOrigin");
if (appOrigin == aOrigin)
tab = tabs[i];
}
if (tab) {
BrowserApp.selectTab(tab);
} else {
tab = BrowserApp.addTab(aURI);
ss.setTabValue(tab, "appOrigin", aOrigin);
}
}
}

5
mobile/android/chrome/jar.mn
View File

@ -10,8 +10,6 @@ chrome.jar:
content/aboutCertError.xhtml (content/aboutCertError.xhtml)
content/aboutHome.xhtml (content/aboutHome.xhtml)
* content/aboutRights.xhtml (content/aboutRights.xhtml)
* content/aboutApps.xhtml (content/aboutApps.xhtml)
content/aboutApps.js (content/aboutApps.js)
content/blockedSite.xhtml (content/blockedSite.xhtml)
content/languages.properties (content/languages.properties)
* content/browser.xul (content/browser.xul)
@ -28,8 +26,7 @@ chrome.jar:
* content/downloads.js (content/downloads.js)
content/netError.xhtml (content/netError.xhtml)
content/SelectHelper.js (content/SelectHelper.js)
content/webapps.js (content/webapps.js)
% override chrome://global/content/config.xul chrome://browser/content/config.xhtml
% override chrome://global/content/netError.xhtml chrome://browser/content/netError.xhtml
% override chrome://mozapps/content/extensions/extensions.xul chrome://browser/content/aboutAddons.xhtml

4
mobile/android/components/AboutRedirector.js
View File

@ -85,10 +85,6 @@ let modules = {
home: {
uri: "chrome://browser/content/aboutHome.xhtml",
privileged: true
},
apps: {
uri: "chrome://browser/content/aboutApps.xhtml",
privileged: true
}
}

1
mobile/android/components/MobileComponents.manifest
View File

@ -7,7 +7,6 @@ contract @mozilla.org/network/protocol/about;1?what=empty {322ba47e-7047-4f71-ae
contract @mozilla.org/network/protocol/about;1?what=rights {322ba47e-7047-4f71-aebf-cb7d69325cd9}
contract @mozilla.org/network/protocol/about;1?what=certerror {322ba47e-7047-4f71-aebf-cb7d69325cd9}
contract @mozilla.org/network/protocol/about;1?what=home {322ba47e-7047-4f71-aebf-cb7d69325cd9}
contract @mozilla.org/network/protocol/about;1?what=apps {322ba47e-7047-4f71-aebf-cb7d69325cd9}
#ifdef MOZ_SAFE_BROWSING
contract @mozilla.org/network/protocol/about;1?what=blocked {322ba47e-7047-4f71-aebf-cb7d69325cd9}
#endif

6
mobile/android/installer/package-manifest.in
View File

@ -150,7 +150,6 @@
@BINPATH@/components/directory.xpt
@BINPATH@/components/docshell.xpt
@BINPATH@/components/dom.xpt
@BINPATH@/components/dom_apps.xpt
@BINPATH@/components/dom_base.xpt
@BINPATH@/components/dom_battery.xpt
@BINPATH@/components/dom_canvas.xpt
@ -285,6 +284,7 @@
@BINPATH@/components/xuldoc.xpt
@BINPATH@/components/xultmpl.xpt
@BINPATH@/components/zipwriter.xpt
@BINPATH@/components/openwebapps.xpt
; JavaScript components
@BINPATH@/components/ConsoleAPI.manifest
@ -338,6 +338,7 @@
@BINPATH@/components/amContentHandler.js
@BINPATH@/components/amWebInstallListener.js
@BINPATH@/components/nsBlocklistService.js
@BINPATH@/components/OpenWebapps.manifest
#ifdef MOZ_UPDATER
@BINPATH@/components/nsUpdateService.manifest
@ -410,8 +411,6 @@
#endif
@BINPATH@/components/TelemetryPing.js
@BINPATH@/components/TelemetryPing.manifest
@BINPATH@/components/Webapps.js
@BINPATH@/components/Webapps.manifest
; Modules
@BINPATH@/modules/*
@ -614,6 +613,7 @@ bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@
@BINPATH@/components/PromptService.js
@BINPATH@/components/SessionStore.js
@BINPATH@/components/Sidebar.js
@BINPATH@/components/OpenWebapps.js
#ifdef MOZ_SAFE_BROWSING
@BINPATH@/components/SafeBrowsing.js
#endif

8
mobile/android/locales/en-US/chrome/aboutApps.dtd
View File

@ -1,8 +0,0 @@
<!ENTITY aboutApps.title "Your Apps">
<!-- LOCALIZATION NOTE (aboutApps.noApps.pre): include a trailing space as needed -->
<!-- LOCALIZATION NOTE (aboutApps.noApps.middle): avoid leading/trailing spaces, this text is a link -->
<!-- LOCALIZATION NOTE (aboutApps.noApps.post): include a starting space as needed -->
<!ENTITY aboutApps.noApps.pre "No web apps installed. Get some from the ">
<!ENTITY aboutApps.noApps.middle "app store">
<!ENTITY aboutApps.noApps.post ".">

2
mobile/android/locales/en-US/chrome/aboutApps.properties
View File

@ -1,2 +0,0 @@
appsContext.uninstall=Uninstall
appsContext.shortcut=Add to Home Screen

11
mobile/android/locales/en-US/chrome/browser.properties
View File

@ -225,19 +225,10 @@ timer.start=%S: timer started
# %1$S=name of timer, %2$S=number of milliseconds
timer.end=%1$S: %2$Sms
#Webapps
webapps.installTitle=Install Application
# Click to play plugins
clickToPlayPlugins.message1=%S contains plugin content. Would you like to play it?
clickToPlayPlugins.message=This page contains plugin content. Would you like to play it?
clickToPlayPlugins.yes=Yes
clickToPlayPlugins.no=No
# LOCALIZATION NOTE (clickToPlayPlugins.dontAskAgain): This label appears next to a
# checkbox to indicate whether or not the user wants to make a permanent decision.
clickToPlayPlugins.dontAskAgain=Don't ask again for this site
# LOCALIZATION NOTE (clickToPlayPlugins.playPlugins): Label that
# will be used in site settings dialog.
clickToPlayPlugins.playPlugins=Play Plugins
# Site settings dialog
# LOCALIZATION NOTE (siteSettings.labelToValue): This string will be used to

7
mobile/android/locales/en-US/chrome/webapps.dtd Normal file
View File

@ -0,0 +1,7 @@
<!ENTITY webapps.title.placeholder "Enter a title">
<!ENTITY webapps.permissions "Allow access:">
<!ENTITY webapps.perm.geolocation "Location-aware browsing">
<!ENTITY webapps.perm.offline "Offline data storage">
<!ENTITY webapps.perm.notifications "Desktop notifications">
<!ENTITY webapps.perm.requestedHint "(requested)">
<!ENTITY webapps.add-homescreen "Add to home screen">

3
mobile/android/locales/jar.mn
View File

@ -5,8 +5,6 @@
locale/@AB_CD@/browser/about.dtd (%chrome/about.dtd)
locale/@AB_CD@/browser/aboutAddons.dtd (%chrome/aboutAddons.dtd)
locale/@AB_CD@/browser/aboutAddons.properties (%chrome/aboutAddons.properties)
locale/@AB_CD@/browser/aboutApps.dtd (%chrome/aboutApps.dtd)
locale/@AB_CD@/browser/aboutApps.properties (%chrome/aboutApps.properties)
locale/@AB_CD@/browser/aboutCertError.dtd (%chrome/aboutCertError.dtd)
locale/@AB_CD@/browser/browser.properties (%chrome/browser.properties)
locale/@AB_CD@/browser/config.dtd (%chrome/config.dtd)
@ -18,5 +16,6 @@
locale/@AB_CD@/browser/sync.dtd (%chrome/sync.dtd)
locale/@AB_CD@/browser/sync.properties (%chrome/sync.properties)
locale/@AB_CD@/browser/prompt.dtd (%chrome/prompt.dtd)
locale/@AB_CD@/browser/webapps.dtd (%chrome/webapps.dtd)
locale/@AB_CD@/browser/feedback.dtd (%chrome/feedback.dtd)
locale/@AB_CD@/browser/phishing.dtd (%chrome/phishing.dtd)

43
mobile/android/themes/core/aboutApps.css
View File

@ -1,43 +0,0 @@
html {
font-family: "Droid Sans",helvetica,arial,clean,sans-serif;
font-size: 18px;
background-image: url("chrome://browser/skin/images/about-bg-lightblue.png");
-moz-text-size-adjust: none;
}
#main-container {
margin: 1em;
padding: 1em;
border-radius: 10px;
border: 1px solid grey;
background-color: white;
}
.spacer {
clear: both;
}
.app {
float: left;
cursor: pointer;
text-align: center;
margin: 1em;
width: 70px;
height: 85px;
font-size: 10px;
}
.app img {
width: 64px;
height: 64px;
}
#noapps {
padding: 1em;
text-align: center;
}
.hidden {
display: none;
}

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

@ -5,7 +5,6 @@ chrome.jar:
skin/aboutPage.css (aboutPage.css)
skin/about.css (about.css)
skin/aboutAddons.css (aboutAddons.css)
skin/aboutApps.css (aboutApps.css)
* skin/browser.css (browser.css)
* skin/content.css (content.css)
skin/config.css (config.css)