summaryrefslogtreecommitdiff
path: root/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2013-05-28 09:23:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-05-28 09:23:24 +0000
commit6d77ae9d815679eb653be986eb72d34ecc72d379 (patch)
tree18289d181ccac85c75899491d59c8644e254373c /java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
parent07e56e76a77ee4164201b7f48aa6f7c8d69a81b9 (diff)
parente7e7b3234c369d0907b0188ec5d39165634d218c (diff)
Merge "Remove KeyboardStart.isInMomentarySwitchState"
Diffstat (limited to 'java/src/com/android/inputmethod/keyboard/MainKeyboardView.java')
-rw-r--r--java/src/com/android/inputmethod/keyboard/MainKeyboardView.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
index 34464f690..7493df874 100644
--- a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
@@ -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;