Merge "Remove getTimer() reference except from PointerTracker" (a299421f) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -273,7 +273,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
	public void startDoubleTapShiftKeyTimer() {		public void startDoubleTapShiftKeyTimer() {
	final MainKeyboardView keyboardView = getMainKeyboardView();		final MainKeyboardView keyboardView = getMainKeyboardView();
	if (keyboardView != null) {		if (keyboardView != null) {
	keyboardView.getTimerProxy().startDoubleTapShiftKeyTimer();		keyboardView.startDoubleTapShiftKeyTimer();
	}		}
	}		}

	@@ -282,7 +282,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
	public void cancelDoubleTapShiftKeyTimer() {		public void cancelDoubleTapShiftKeyTimer() {
	final MainKeyboardView keyboardView = getMainKeyboardView();		final MainKeyboardView keyboardView = getMainKeyboardView();
	if (keyboardView != null) {		if (keyboardView != null) {
	keyboardView.getTimerProxy().cancelDoubleTapShiftKeyTimer();		keyboardView.cancelDoubleTapShiftKeyTimer();
	}		}
	}		}

	@@ -290,7 +290,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
	@Override		@Override
	public boolean isInDoubleTapShiftKeyTimeout() {		public boolean isInDoubleTapShiftKeyTimeout() {
	final MainKeyboardView keyboardView = getMainKeyboardView();		final MainKeyboardView keyboardView = getMainKeyboardView();
	return keyboardView != null && keyboardView.getTimerProxy().isInDoubleTapShiftKeyTimeout();		return keyboardView != null && keyboardView.isInDoubleTapShiftKeyTimeout();
	}		}

	/**		/**

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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		@Override
	public boolean dispatchTouchEvent(MotionEvent event) {		public boolean dispatchTouchEvent(MotionEvent event) {
	if (AccessibilityUtils.getInstance().isTouchExplorationEnabled()) {		if (AccessibilityUtils.getInstance().isTouchExplorationEnabled()) {