diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-07-25 07:29:01 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2013-07-25 07:29:02 +0000 |
| commit | 058f37f8badf646928cfa099240e612c4be76077 (patch) | |
| tree | 17a53aa205b3a261e3b8a18581bca78926ea2971 /java/src | |
| parent | 5563dc3ad51a350f67ad857991aa97623a0084b8 (diff) | |
| parent | 5b696d8336a1c15d7c87b53e057a2f59d0176090 (diff) | |
| download | latinime-058f37f8badf646928cfa099240e612c4be76077.tar.gz latinime-058f37f8badf646928cfa099240e612c4be76077.tar.xz latinime-058f37f8badf646928cfa099240e612c4be76077.zip | |
Merge "Cosmetic code optimization"
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java | 10 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/MainKeyboardView.java | 2 |
2 files changed, 3 insertions, 9 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java index 109d6a0cf..bb1aa4776 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java @@ -29,7 +29,6 @@ import android.view.inputmethod.EditorInfo; import com.android.inputmethod.accessibility.AccessibleKeyboardViewProxy; 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.latin.InputView; import com.android.inputmethod.latin.LatinIME; @@ -274,8 +273,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions { public void startDoubleTapShiftKeyTimer() { final MainKeyboardView keyboardView = getMainKeyboardView(); if (keyboardView != null) { - final TimerProxy timer = keyboardView.getTimerProxy(); - timer.startDoubleTapShiftKeyTimer(); + keyboardView.getTimerProxy().startDoubleTapShiftKeyTimer(); } } @@ -284,8 +282,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions { public void cancelDoubleTapShiftKeyTimer() { final MainKeyboardView keyboardView = getMainKeyboardView(); if (keyboardView != null) { - final TimerProxy timer = keyboardView.getTimerProxy(); - timer.cancelDoubleTapShiftKeyTimer(); + keyboardView.getTimerProxy().cancelDoubleTapShiftKeyTimer(); } } @@ -293,8 +290,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions { @Override public boolean isInDoubleTapShiftKeyTimeout() { final MainKeyboardView keyboardView = getMainKeyboardView(); - return (keyboardView != null) - ? keyboardView.getTimerProxy().isInDoubleTapShiftKeyTimeout() : false; + return keyboardView != null && keyboardView.getTimerProxy().isInDoubleTapShiftKeyTimeout(); } /** diff --git a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java index a45133c3f..212338021 100644 --- a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java @@ -775,8 +775,6 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack private static final int STATE_RIGHT = 2; private static final int STATE_NORMAL = 0; 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 public void showKeyPreview(final PointerTracker tracker) { |