diff options
Diffstat (limited to 'accessible/jsat/AccessFu.jsm')
| -rw-r--r-- | accessible/jsat/AccessFu.jsm | 31 |
1 files changed, 5 insertions, 26 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) { |