aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-09-28 00:51:30 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-28 00:51:30 -0700
commit33f425d74f3b1f8caf5080663cc725c09d5febe4 (patch)
tree0f5507f238e1247a37b8e6c93b9e5e5cf6543702 /java/res
parent14295a2efa31cdccb56728a3155e17ca8d0516d0 (diff)
parenta244d534af7d74d2865063b1ec96f37e552192c6 (diff)
downloadlatinime-33f425d74f3b1f8caf5080663cc725c09d5febe4.tar.gz
latinime-33f425d74f3b1f8caf5080663cc725c09d5febe4.tar.xz
latinime-33f425d74f3b1f8caf5080663cc725c09d5febe4.zip
am a244d534: am ad6b493c: Merge "Remove dead code for disabling gesture input after fast typing" into jb-mr1-dev
* commit 'a244d534af7d74d2865063b1ec96f37e552192c6': Remove dead code for disabling gesture input after fast typing
Diffstat (limited to 'java/res')
-rw-r--r--java/res/values/attrs.xml2
-rw-r--r--java/res/values/config.xml1
-rw-r--r--java/res/values/styles.xml1
3 files changed, 0 insertions, 4 deletions
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index acc5df2e5..7e8c77e13 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -125,8 +125,6 @@
<attr name="longPressShiftKeyTimeout" format="integer" />
<!-- Ignore special key timeout while typing in millisecond. -->
<attr name="ignoreAltCodeKeyTimeout" format="integer" />
- <!-- Disable gesture input while fast typing timer in millisecond. -->
- <attr name="disableGestureWhileFastTypingTimeout" format="integer" />
<!-- More keys keyboard will shown at touched point. -->
<attr name="showMoreKeysKeyboardAtTouchedPoint" format="boolean" />
</declare-styleable>
diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index 1f6adffbb..8e2d43e4e 100644
--- a/java/res/values/config.xml
+++ b/java/res/values/config.xml
@@ -66,7 +66,6 @@
<!-- Long pressing shift will invoke caps-lock if > 0, never invoke caps-lock if == 0 -->
<integer name="config_long_press_shift_key_timeout">1200</integer>
<integer name="config_ignore_alt_code_key_timeout">350</integer>
- <integer name="config_disable_gesture_while_fast_typing_timeout">350</integer>
<!-- Showing more keys keyboard, just above the touched point if true, aligned to the key if
false -->
<bool name="config_show_more_keys_keyboard_at_touched_point">false</bool>
diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml
index 928c5f5d0..9d3d71607 100644
--- a/java/res/values/styles.xml
+++ b/java/res/values/styles.xml
@@ -89,7 +89,6 @@
<item name="longPressKeyTimeout">@integer/config_long_press_key_timeout</item>
<item name="longPressShiftKeyTimeout">@integer/config_long_press_shift_key_timeout</item>
<item name="ignoreAltCodeKeyTimeout">@integer/config_ignore_alt_code_key_timeout</item>
- <item name="disableGestureWhileFastTypingTimeout">@integer/config_disable_gesture_while_fast_typing_timeout</item>
<item name="showMoreKeysKeyboardAtTouchedPoint">@bool/config_show_more_keys_keyboard_at_touched_point</item>
<item name="languageOnSpacebarFinalAlpha">@integer/config_language_on_spacebar_final_alpha</item>
<item name="languageOnSpacebarFadeoutAnimator">@anim/language_on_spacebar_fadeout</item>