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

Merge "Remove KeyboardStart.isInMomentarySwitchState"

main
Tadashi G. Takaoka 2013-05-28 09:23:23 +00:00 committed by Android (Google) Code Review
parent 07e56e76a7 e7e7b3234c
commit 6d77ae9d81
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -335,10 +335,6 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
}
}
public boolean isInMomentarySwitchState() {
return mState.isInMomentarySwitchState();
}
/**
* Updates state machine to figure out when to automatically switch back to the previous mode.
*/

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

@ -315,9 +315,8 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
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;

5
java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java
View File

@ -574,11 +574,6 @@ public final class KeyboardState {
}
}
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;
}