Bug 879791 - Don't send touchscreen hover events to gecko when accessibility is disabled. r=kats

This commit is contained in:
Eitan Isaacson 2015-06-03 13:00:34 -07:00
parent ac67a8df73
commit 2d65260813
2 changed files with 12 additions and 0 deletions

View File

@ -150,6 +150,10 @@ public class GeckoAccessibility {
} }
} }
public static boolean isEnabled() {
return sEnabled;
}
public static void sendAccessibilityEvent (final JSONObject message) { public static void sendAccessibilityEvent (final JSONObject message) {
if (!sEnabled) if (!sEnabled)
return; return;

View File

@ -43,6 +43,7 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.inputmethod.EditorInfo; import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputConnection; import android.view.inputmethod.InputConnection;
import android.view.InputDevice;
import android.widget.FrameLayout; import android.widget.FrameLayout;
/** /**
@ -243,6 +244,13 @@ public class LayerView extends FrameLayout implements Tabs.OnTabsChangedListener
@Override @Override
public boolean onHoverEvent(MotionEvent event) { public boolean onHoverEvent(MotionEvent event) {
// If we get a touchscreen hover event, and accessibility is not enabled,
// don't send it to gecko.
if (event.getSource() == InputDevice.SOURCE_TOUCHSCREEN &&
!GeckoAccessibility.isEnabled()) {
return false;
}
return sendEventToGecko(event); return sendEventToGecko(event);
} }