aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-10-07 09:02:10 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-07 09:02:10 -0700
commitb1583b9eca9e0c57a1b1caefe84af04a8477f6d7 (patch)
tree9d6facde266f7ed816f84dec0ef40959f7a2278f /java/res
parentc0a5f07c9bf93962e3082ca770aa32f96811bcd9 (diff)
parent052b162df6d7ae35840198bf84fc422f956ba9e8 (diff)
downloadlatinime-b1583b9eca9e0c57a1b1caefe84af04a8477f6d7.tar.gz
latinime-b1583b9eca9e0c57a1b1caefe84af04a8477f6d7.tar.xz
latinime-b1583b9eca9e0c57a1b1caefe84af04a8477f6d7.zip
am 052b162d: Merge "Add separate key hysteresis distance for sliding modifier input" into jb-mr1-dev
* commit '052b162df6d7ae35840198bf84fc422f956ba9e8': Add separate key hysteresis distance for sliding modifier input
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, 4 insertions, 0 deletions
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index 72dcb0e35..53051d033 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -109,6 +109,8 @@
<attr name="altCodeKeyWhileTypingFadeinAnimator" format="reference" />
<!-- Key detection hysteresis distance. -->
<attr name="keyHysteresisDistance" format="dimension" />
+ <!-- Key detection hysteresis distance for shift/symbols sliding input. -->
+ <attr name="keyHysteresisDistanceForSlidingModifier" format="dimension" />
<!-- Touch noise threshold time in millisecond -->
<attr name="touchNoiseThresholdTime" format="integer" />
<!-- Touch noise threshold distance in millimeter -->
diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index 7c57f1f2b..b3dbb0ee5 100644
--- a/java/res/values/config.xml
+++ b/java/res/values/config.xml
@@ -57,6 +57,7 @@
Configuration for MainKeyboardView
-->
<dimen name="config_key_hysteresis_distance">8.0dp</dimen>
+ <dimen name="config_key_hysteresis_distance_for_sliding_modifier">8.0dp</dimen>
<integer name="config_touch_noise_threshold_time">40</integer>
<dimen name="config_touch_noise_threshold_distance">12.6dp</dimen>
<bool name="config_sliding_key_input_enabled">true</bool>
diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml
index 589962c27..dbb56ab4d 100644
--- a/java/res/values/styles.xml
+++ b/java/res/values/styles.xml
@@ -81,6 +81,7 @@
<item name="gesturePreviewTrailEndWidth">@dimen/gesture_preview_trail_end_width</item>
<!-- Common attributes of MainKeyboardView -->
<item name="keyHysteresisDistance">@dimen/config_key_hysteresis_distance</item>
+ <item name="keyHysteresisDistanceForSlidingModifier">@dimen/config_key_hysteresis_distance_for_sliding_modifier</item>
<item name="touchNoiseThresholdTime">@integer/config_touch_noise_threshold_time</item>
<item name="touchNoiseThresholdDistance">@dimen/config_touch_noise_threshold_distance</item>
<item name="slidingKeyInputEnable">@bool/config_sliding_key_input_enabled</item>