Cosmetic code optimization (5b696d83) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+3 −7

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,6 @@ import android.view.inputmethod.EditorInfo;

	import com.android.inputmethod.accessibility.AccessibleKeyboardViewProxy;		import com.android.inputmethod.accessibility.AccessibleKeyboardViewProxy;
	import com.android.inputmethod.keyboard.KeyboardLayoutSet.KeyboardLayoutSetException;		import com.android.inputmethod.keyboard.KeyboardLayoutSet.KeyboardLayoutSetException;
	import com.android.inputmethod.keyboard.PointerTracker.TimerProxy;
	import com.android.inputmethod.keyboard.internal.KeyboardState;		import com.android.inputmethod.keyboard.internal.KeyboardState;
	import com.android.inputmethod.latin.InputView;		import com.android.inputmethod.latin.InputView;
	import com.android.inputmethod.latin.LatinIME;		import com.android.inputmethod.latin.LatinIME;
	@@ -274,8 +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) {
	final TimerProxy timer = keyboardView.getTimerProxy();		keyboardView.getTimerProxy().startDoubleTapShiftKeyTimer();
	timer.startDoubleTapShiftKeyTimer();
	}		}
	}		}

	@@ -284,8 +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) {
	final TimerProxy timer = keyboardView.getTimerProxy();		keyboardView.getTimerProxy().cancelDoubleTapShiftKeyTimer();
	timer.cancelDoubleTapShiftKeyTimer();
	}		}
	}		}

	@@ -293,8 +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)		return keyboardView != null && keyboardView.getTimerProxy().isInDoubleTapShiftKeyTimeout();
	? keyboardView.getTimerProxy().isInDoubleTapShiftKeyTimeout() : false;
	}		}

	/**		/**

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

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -775,8 +775,6 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
	private static final int STATE_RIGHT = 2;		private static final int STATE_RIGHT = 2;
	private static final int STATE_NORMAL = 0;		private static final int STATE_NORMAL = 0;
	private static final int STATE_HAS_MOREKEYS = 1;		private static final int STATE_HAS_MOREKEYS = 1;
	private static final int[] KEY_PREVIEW_BACKGROUND_DEFAULT_STATE =
	KEY_PREVIEW_BACKGROUND_STATE_TABLE[STATE_MIDDLE][STATE_NORMAL];

	@Override		@Override
	public void showKeyPreview(final PointerTracker tracker) {		public void showKeyPreview(final PointerTracker tracker) {