nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 1751615f: Merge "Remove unnecessary override of MainKeyboardView.dispatchTouchEvent" 

* commit '1751615f7d6702c6f3438a402e0ce179aafd15cf':
  Remove unnecessary override of MainKeyboardView.dispatchTouchEvent
main
Tadashi G. Takaoka 2014-02-17 00:29:04 -08:00 committed by Android Git Automerger
parent 93441101ac 1751615f7d
commit bf723b081a
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
java/src/com/android/inputmethod/accessibility/AccessibleKeyboardViewProxy.java
View File

@ -203,19 +203,6 @@ public final class AccessibleKeyboardViewProxy extends AccessibilityDelegateComp
return getAccessibilityNodeProvider();
}
/**
* Intercepts touch events before dispatch when touch exploration is turned on in ICS and
* higher.
*
* @param event The motion event being dispatched.
* @return {@code true} if the event is handled
*/
public boolean dispatchTouchEvent(final MotionEvent event) {
// To avoid accidental key presses during touch exploration, always drop
// touch events generated by the user.
return false;
}
/**
* Receives hover events when touch exploration is turned on in SDK versions ICS and higher.
*

8
java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
View File

@ -725,14 +725,6 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
return mKeyTimerHandler.isInDoubleTapShiftKeyTimeout();
}
@Override
public boolean dispatchTouchEvent(MotionEvent event) {
if (AccessibilityUtils.getInstance().isTouchExplorationEnabled()) {
return AccessibleKeyboardViewProxy.getInstance().dispatchTouchEvent(event);
}
return super.dispatchTouchEvent(event);
}
@Override
public boolean onTouchEvent(final MotionEvent me) {
if (getKeyboard() == null) {