diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-11-18 09:15:36 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2011-11-18 09:15:36 -0800 |
| commit | ea953fd555569202668ecaa69e2b8630f88f85ed (patch) | |
| tree | b75e3ebaccd5ae1a6513ad0fee3efec2e75496fc /java/res | |
| parent | a25c8e69c2fac73905bdd0d5bf38ee9943786634 (diff) | |
| parent | 49cc3beb75e2916037a0f8ff2d2795f306918598 (diff) | |
| download | latinime-ea953fd555569202668ecaa69e2b8630f88f85ed.tar.gz latinime-ea953fd555569202668ecaa69e2b8630f88f85ed.tar.xz latinime-ea953fd555569202668ecaa69e2b8630f88f85ed.zip | |
am 49cc3beb: resolved conflicts for merge of 137667ed to master
* commit '49cc3beb75e2916037a0f8ff2d2795f306918598':
Ignore microphone and settings key while typing
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> |