commit | e7e7b3234c369d0907b0188ec5d39165634d218c | [log] [tgz] |
---|---|---|
author | Tadashi G. Takaoka <takaoka@google.com> | Tue May 28 15:25:40 2013 +0900 |
committer | Tadashi G. Takaoka <takaoka@google.com> | Tue May 28 15:26:03 2013 +0900 |
tree | 99a93003cf779813924e1eb0d3a26f4a71ead444 | |
parent | a2d8d30f8eba001742099096da53e42e77dd367a [diff] |
Remove KeyboardStart.isInMomentarySwitchState Change-Id: I00f45d8dd7feb6c34c0a65a8545cddd2751796d0
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java index c5bd624..83f1090 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
@@ -335,10 +335,6 @@ } } - public boolean isInMomentarySwitchState() { - return mState.isInMomentarySwitchState(); - } - /** * Updates state machine to figure out when to automatically switch back to the previous mode. */
diff --git a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java index 34464f6..7493df8 100644 --- a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
@@ -315,9 +315,8 @@ default: final int longpressTimeout = Settings.getInstance().getCurrent().mKeyLongpressTimeout; - if (KeyboardSwitcher.getInstance().isInMomentarySwitchState()) { - // We use longer timeout for sliding finger input started from the symbols - // mode key. + if (tracker.isInSlidingKeyInputFromModifier()) { + // We use longer timeout for sliding finger input started from the modifier key. delay = longpressTimeout * 3; } else { delay = longpressTimeout;
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java index f18d5ed..9f6374b 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java
@@ -574,11 +574,6 @@ } } - public boolean isInMomentarySwitchState() { - return mSwitchState == SWITCH_STATE_MOMENTARY_ALPHA_AND_SYMBOL - || mSwitchState == SWITCH_STATE_MOMENTARY_SYMBOL_AND_MORE; - } - private static boolean isSpaceCharacter(final int c) { return c == Constants.CODE_SPACE || c == Constants.CODE_ENTER; }