diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-11-18 08:49:06 -0800 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2011-11-18 08:51:39 -0800 |
| commit | 49cc3beb75e2916037a0f8ff2d2795f306918598 (patch) | |
| tree | b75e3ebaccd5ae1a6513ad0fee3efec2e75496fc /java/res | |
| parent | a41fddc67668ab85c83dbed40602d2b2a5bd47e5 (diff) | |
| parent | 137667ed3da6c999cb7f1bcfd9e8030f06ec3713 (diff) | |
| download | latinime-49cc3beb75e2916037a0f8ff2d2795f306918598.tar.gz latinime-49cc3beb75e2916037a0f8ff2d2795f306918598.tar.xz latinime-49cc3beb75e2916037a0f8ff2d2795f306918598.zip | |
resolved conflicts for merge of 137667ed to master
Change-Id: I75fc5d278b002ab89dd2475d282d0ee4aede7817
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values/config.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/java/res/values/config.xml b/java/res/values/config.xml index e4f5f377a..bad4bc625 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -63,6 +63,7 @@ <integer name="config_long_press_space_key_timeout">@integer/config_long_press_key_timeout</integer> <integer name="config_touch_noise_threshold_millis">40</integer> <integer name="config_double_spaces_turn_into_period_timeout">1100</integer> + <integer name="config_ignore_special_key_timeout">700</integer> <dimen name="config_touch_noise_threshold_distance">2.0mm</dimen> <!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. --> <string name="config_default_keyboard_theme_id" translatable="false">5</string> |