Merge "Simplifying accessibility code in keyboard's dispatchTouchEvent()"

This commit is contained in:
Ken Wakasa 2011-07-29 01:22:11 -07:00 committed by Android (Google) Code Review
commit f12aa77c4b
2 changed files with 2 additions and 11 deletions

View file

@ -118,15 +118,6 @@ public class AccessibleKeyboardViewProxy {
return onHoverEventInternal(event, tracker); return onHoverEventInternal(event, tracker);
} }
public boolean dispatchTouchEvent(MotionEvent event) {
// Since touch exploration translates hover double-tap to a regular
// single-tap, we're going to drop non-touch exploration events.
if (!AccessibilityUtils.getInstance().isTouchExplorationEvent(event))
return true;
return false;
}
/** /**
* Handles touch exploration events when Accessibility is turned on. * Handles touch exploration events when Accessibility is turned on.
* *

View file

@ -567,9 +567,9 @@ public class LatinKeyboardBaseView extends KeyboardView implements PointerTracke
@Override @Override
public boolean dispatchTouchEvent(MotionEvent event) { public boolean dispatchTouchEvent(MotionEvent event) {
// Drop non-hover touch events when touch exploration is enabled.
if (AccessibilityUtils.getInstance().isTouchExplorationEnabled()) { if (AccessibilityUtils.getInstance().isTouchExplorationEnabled()) {
return AccessibleKeyboardViewProxy.getInstance().dispatchTouchEvent(event) return false;
|| super.dispatchTouchEvent(event);
} }
return super.dispatchTouchEvent(event); return super.dispatchTouchEvent(event);