aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2013-01-20 23:37:22 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-01-20 23:37:22 -0800
commit99b5393422ddaaf02cf6669acb84c7fc4d2644cb (patch)
tree14507efefcbe8b1f7ffeadaf4539b42e98cbcacb /java/res
parentfe4b3ff0a350ee7bbe88f66cb05ed15dceefbbae (diff)
parent9c968b62d1b4049959b7b7b0f05388c90e31b46e (diff)
downloadlatinime-99b5393422ddaaf02cf6669acb84c7fc4d2644cb.tar.gz
latinime-99b5393422ddaaf02cf6669acb84c7fc4d2644cb.tar.xz
latinime-99b5393422ddaaf02cf6669acb84c7fc4d2644cb.zip
am 9c968b62: Move gesture related XML attribute to MainKeyboardView
* commit '9c968b62d1b4049959b7b7b0f05388c90e31b46e': Move gesture related XML attribute to MainKeyboardView
Diffstat (limited to 'java/res')
-rw-r--r--java/res/values/attrs.xml35
1 files changed, 17 insertions, 18 deletions
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index 63c29bf29..721df5ec3 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -60,24 +60,6 @@
<attr name="verticalCorrection" format="dimension" />
<attr name="backgroundDimAlpha" format="integer" />
-
- <!-- Attributes for PreviewPlacerView -->
- <attr name="gestureFloatingPreviewTextSize" format="dimension" />
- <attr name="gestureFloatingPreviewTextColor" format="color" />
- <attr name="gestureFloatingPreviewTextOffset" format="dimension" />
- <attr name="gestureFloatingPreviewColor" format="color" />
- <attr name="gestureFloatingPreviewHorizontalPadding" format="dimension" />
- <attr name="gestureFloatingPreviewVerticalPadding" format="dimension" />
- <attr name="gestureFloatingPreviewRoundRadius" format="dimension" />
- <!-- Delay after gesture trail starts fading out in millisecond. -->
- <attr name="gesturePreviewTrailFadeoutStartDelay" format="integer" />
- <!-- Duration while gesture preview trail is fading out in millisecond. -->
- <attr name="gesturePreviewTrailFadeoutDuration" format="integer" />
- <!-- Interval of updating gesture preview trail in millisecond. -->
- <attr name="gesturePreviewTrailUpdateInterval" format="integer" />
- <attr name="gesturePreviewTrailColor" format="color" />
- <attr name="gesturePreviewTrailStartWidth" format="dimension" />
- <attr name="gesturePreviewTrailEndWidth" format="dimension" />
</declare-styleable>
<declare-styleable name="MainKeyboardView">
@@ -125,8 +107,25 @@
<attr name="moreKeysKeyboardLayout" format="reference" />
<!-- More keys keyboard will shown at touched point. -->
<attr name="showMoreKeysKeyboardAtTouchedPoint" format="boolean" />
+ <!-- Delay after gesture trail starts fading out in millisecond. -->
+ <attr name="gesturePreviewTrailFadeoutStartDelay" format="integer" />
+ <!-- Duration while gesture preview trail is fading out in millisecond. -->
+ <attr name="gesturePreviewTrailFadeoutDuration" format="integer" />
+ <!-- Interval of updating gesture preview trail in millisecond. -->
+ <attr name="gesturePreviewTrailUpdateInterval" format="integer" />
+ <attr name="gesturePreviewTrailColor" format="color" />
+ <attr name="gesturePreviewTrailStartWidth" format="dimension" />
+ <attr name="gesturePreviewTrailEndWidth" format="dimension" />
<!-- Delay after gesture input and gesture floating preview text dismissing in millisecond -->
<attr name="gestureFloatingPreviewTextLingerTimeout" format="integer" />
+ <!-- Attributes for GestureFloatingPreviewText -->
+ <attr name="gestureFloatingPreviewTextSize" format="dimension" />
+ <attr name="gestureFloatingPreviewTextColor" format="color" />
+ <attr name="gestureFloatingPreviewTextOffset" format="dimension" />
+ <attr name="gestureFloatingPreviewColor" format="color" />
+ <attr name="gestureFloatingPreviewHorizontalPadding" format="dimension" />
+ <attr name="gestureFloatingPreviewVerticalPadding" format="dimension" />
+ <attr name="gestureFloatingPreviewRoundRadius" format="dimension" />
<!-- Static threshold for gesture after fast typing (msec) -->
<attr name="gestureStaticTimeThresholdAfterFastTyping" format="integer" />
<!-- Static threshold for starting gesture detection (keyWidth%/sec) -->