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

am a299421f: Merge "Remove getTimer() reference except from PointerTracker" 

* commit 'a299421f67e6800e3d19021df275029f5d084a8b':
  Remove getTimer() reference except from PointerTracker
main
Tadashi G. Takaoka 2013-08-01 00:57:30 -07:00 committed by Android Git Automerger
parent 3f30c09d88 a299421f67
commit 40f8a487e0
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
View File

@ -273,7 +273,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
public void startDoubleTapShiftKeyTimer() {
final MainKeyboardView keyboardView = getMainKeyboardView();
if (keyboardView != null) {
keyboardView.getTimerProxy().startDoubleTapShiftKeyTimer();
keyboardView.startDoubleTapShiftKeyTimer();
}
}
@ -282,7 +282,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
public void cancelDoubleTapShiftKeyTimer() {
final MainKeyboardView keyboardView = getMainKeyboardView();
if (keyboardView != null) {
keyboardView.getTimerProxy().cancelDoubleTapShiftKeyTimer();
keyboardView.cancelDoubleTapShiftKeyTimer();
}
}
@ -290,7 +290,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
@Override
public boolean isInDoubleTapShiftKeyTimeout() {
final MainKeyboardView keyboardView = getMainKeyboardView();
return keyboardView != null && keyboardView.getTimerProxy().isInDoubleTapShiftKeyTimeout();
return keyboardView != null && keyboardView.isInDoubleTapShiftKeyTimeout();
}
/**

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

@ -1007,6 +1007,18 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
}
}
public void startDoubleTapShiftKeyTimer() {
mKeyTimerHandler.startDoubleTapShiftKeyTimer();
}
public void cancelDoubleTapShiftKeyTimer() {
mKeyTimerHandler.cancelDoubleTapShiftKeyTimer();
}
public boolean isInDoubleTapShiftKeyTimeout() {
return mKeyTimerHandler.isInDoubleTapShiftKeyTimeout();
}
@Override
public boolean dispatchTouchEvent(MotionEvent event) {
if (AccessibilityUtils.getInstance().isTouchExplorationEnabled()) {