diff options
| author |   Kenny Root <kroot@google.com> | 2010-10-10 15:19:53 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2010-10-10 15:19:53 -0700 |
| commit | 6f6dd71862e09c6c296fc1e5b9c8af35604824be (patch) | |
| tree | f403012f874d4ec099dcade81719774691e750e1 /java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java | |
| parent | e3b34081d63d5aedf55e8082279cbeff8d14e6bd (diff) | |
| parent | 23d50bfb13b5def0bc226122baed15ddcace42f6 (diff) | |
| download | latinime-6f6dd71862e09c6c296fc1e5b9c8af35604824be.tar.gz latinime-6f6dd71862e09c6c296fc1e5b9c8af35604824be.tar.xz latinime-6f6dd71862e09c6c296fc1e5b9c8af35604824be.zip | |
resolved conflicts for merge of 23d50bfb to master
Change-Id: Ia3fd85bd0c231f7b910b14caad38fa453a2336f6
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java b/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java index 05b29b9b5..d319d4020 100644 --- a/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java +++ b/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java @@ -154,7 +154,7 @@ public class LatinKeyboardBaseView extends View implements PointerTracker.UIProx } // Timing constants - private static final int REPEAT_INTERVAL = PointerTracker.REPEAT_INTERVAL; + private final int mKeyRepeatInterval; // Miscellaneous constants /* package */ static final int NOT_A_KEY = -1; @@ -261,7 +261,7 @@ public class LatinKeyboardBaseView extends View implements PointerTracker.UIProx case MSG_REPEAT_KEY: { final PointerTracker tracker = (PointerTracker)msg.obj; tracker.repeatKey(msg.arg1); - startKeyRepeatTimer(REPEAT_INTERVAL, msg.arg1, tracker); + startKeyRepeatTimer(mKeyRepeatInterval, msg.arg1, tracker); break; } case MSG_LONGPRESS_KEY: { @@ -542,6 +542,7 @@ public class LatinKeyboardBaseView extends View implements PointerTracker.UIProx mHasDistinctMultitouch = context.getPackageManager() .hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT); + mKeyRepeatInterval = res.getInteger(R.integer.config_key_repeat_interval); } public void setOnKeyboardActionListener(OnKeyboardActionListener listener) { @@ -1221,7 +1222,7 @@ public class LatinKeyboardBaseView extends View implements PointerTracker.UIProx // Create pointer trackers until we can get 'id+1'-th tracker, if needed. for (int i = pointers.size(); i <= id; i++) { final PointerTracker tracker = - new PointerTracker(i, mHandler, mKeyDetector, this, mHasDistinctMultitouch); + new PointerTracker(i, mHandler, mKeyDetector, this, getResources()); if (keys != null) tracker.setKeyboard(mKeyboard, keys, mKeyHysteresisDistance); if (listener != null) |