summaryrefslogtreecommitdiff
path: root/accessible
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-12-25 23:29:47 +0000
committerMoonchild <moonchild@palemoon.org>2020-12-25 23:29:47 +0000
commit9f004841a248c7c17f536be77d7af67de7b3f39b (patch)
tree4efbf2cb6c89ba8427ca48bd1615416105234d7a /accessible
parent62568d94d5e7b9b3cccb3d7cbf5b284005568845 (diff)
downloaduxp-9f004841a248c7c17f536be77d7af67de7b3f39b.tar.gz
Issue #1053 - Part 1c: Remove references to mobile/android targets and paths
Diffstat (limited to 'accessible')
-rw-r--r--accessible/jsat/AccessFu.jsm31
-rw-r--r--accessible/jsat/Gestures.jsm4
-rw-r--r--accessible/jsat/Presentation.jsm1
-rw-r--r--accessible/jsat/Utils.jsm4
4 files changed, 7 insertions, 33 deletions
diff --git a/accessible/jsat/AccessFu.jsm b/accessible/jsat/AccessFu.jsm
index c6b16b38fb..4cfbfc2fa3 100644
--- a/accessible/jsat/AccessFu.jsm
+++ b/accessible/jsat/AccessFu.jsm
@@ -64,9 +64,7 @@ this.AccessFu = { // jshint ignore:line
if (this._enabled) {
this._disable();
}
- if (Utils.MozBuildApp === 'mobile/android') {
- Services.obs.removeObserver(this, 'Accessibility:Settings');
- } else if (Utils.win.navigator.mozSettings) {
+ if (Utils.win.navigator.mozSettings) {
Utils.win.navigator.mozSettings.removeObserver(
SCREENREADER_SETTING, this.handleEvent);
}
@@ -585,11 +583,7 @@ var Output = {
get androidBridge() {
delete this.androidBridge;
- if (Utils.MozBuildApp === 'mobile/android') {
- this.androidBridge = Services.androidBridge;
- } else {
- this.androidBridge = null;
- }
+ this.androidBridge = null;
return this.androidBridge;
},
@@ -815,12 +809,6 @@ var Input = {
target.blur();
}
}
-
- if (Utils.MozBuildApp == 'mobile/android') {
- // Return focus to native Android browser chrome.
- Services.androidBridge.handleGeckoMessage(
- { type: 'ToggleChrome:Focus' });
- }
break;
case aEvent.DOM_VK_RETURN:
if (this.editState.editing) {
@@ -837,18 +825,9 @@ var Input = {
},
moveToPoint: function moveToPoint(aRule, aX, aY) {
- // XXX: Bug 1013408 - There is no alignment between the chrome window's
- // viewport size and the content viewport size in Android. This makes
- // sending mouse events beyond its bounds impossible.
- if (Utils.MozBuildApp === 'mobile/android') {
- let mm = Utils.getMessageManager(Utils.CurrentBrowser);
- mm.sendAsyncMessage('AccessFu:MoveToPoint',
- {rule: aRule, x: aX, y: aY, origin: 'top'});
- } else {
- let win = Utils.win;
- Utils.winUtils.sendMouseEvent('mousemove',
- aX - win.mozInnerScreenX, aY - win.mozInnerScreenY, 0, 0, 0);
- }
+ let win = Utils.win;
+ Utils.winUtils.sendMouseEvent('mousemove',
+ aX - win.mozInnerScreenX, aY - win.mozInnerScreenY, 0, 0, 0);
},
moveCursor: function moveCursor(aAction, aRule, aInputType, aAdjustRange) {
diff --git a/accessible/jsat/Gestures.jsm b/accessible/jsat/Gestures.jsm
index cc431614c7..dd21f040f6 100644
--- a/accessible/jsat/Gestures.jsm
+++ b/accessible/jsat/Gestures.jsm
@@ -76,8 +76,6 @@ const EDGE = 0.1;
const TIMEOUT_MULTIPLIER = 1;
// A single pointer down/up sequence periodically precedes the tripple swipe
// gesture on Android. This delay acounts for that.
-const IS_ANDROID = Utils.MozBuildApp === 'mobile/android' &&
- Utils.AndroidSdkVersion >= 14;
/**
* A point object containing distance travelled data.
@@ -206,7 +204,7 @@ this.GestureTracker = { // jshint ignore:line
if (aDetail.type !== 'pointerdown') {
return;
}
- let GestureConstructor = aGesture || (IS_ANDROID ? DoubleTap : Tap);
+ let GestureConstructor = aGesture || Tap;
this._create(GestureConstructor);
this._update(aDetail, aTimeStamp);
},
diff --git a/accessible/jsat/Presentation.jsm b/accessible/jsat/Presentation.jsm
index 6912d0ea58..bd1ef96ca5 100644
--- a/accessible/jsat/Presentation.jsm
+++ b/accessible/jsat/Presentation.jsm
@@ -680,7 +680,6 @@ this.Presentation = { // jshint ignore:line
get presenters() {
delete this.presenters;
let presenterMap = {
- 'mobile/android': [VisualPresenter, AndroidPresenter],
'b2g': [VisualPresenter, B2GPresenter],
'browser': [VisualPresenter, B2GPresenter, AndroidPresenter]
};
diff --git a/accessible/jsat/Utils.jsm b/accessible/jsat/Utils.jsm
index 4e478cab0d..64a4150583 100644
--- a/accessible/jsat/Utils.jsm
+++ b/accessible/jsat/Utils.jsm
@@ -33,9 +33,7 @@ this.Utils = { // jshint ignore:line
_buildAppMap: {
'{3c2e2abc-06d4-11e1-ac3b-374f68613e61}': 'b2g',
'{d1bfe7d9-c01e-4237-998b-7b5f960a4314}': 'graphene',
- '{ec8030f7-c20a-464f-9b0e-13a3a9e97384}': 'browser',
- '{aa3c5121-dab2-40e2-81ca-7ea25febc110}': 'mobile/android',
- '{a23983c0-fd0e-11dc-95ff-0800200c9a66}': 'mobile/xul'
+ '{ec8030f7-c20a-464f-9b0e-13a3a9e97384}': 'browser'
},
init: function Utils_init(aWindow) {