commit f48637a5b2ac1c28403c385adf7f02965274b7bf
author Tadashi G. Takaoka <takaoka@google.com> Wed Sep 29 13:51:06 2010 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Wed Sep 29 13:51:06 2010 +0900
tree 471e7d148f6b2d4bae4b48a0f680ae3611228a15
parent 819e05f5fe5a58fe179b27d66c18c3ecbf536232
parent 0325360d32dfb8fcf7e8f2f584dc46d48a482af5

resolved conflicts for merge of 0325360d to master

Change-Id: I5926c8d75dbffda20001fa9487fae2e5f723c755

java/res/values-xlarge/dimens.xml

diff --git a/java/res/values-xlarge/dimens.xml b/java/res/values-xlarge/dimens.xml
index 7c26729..9e4736f 100644
--- a/java/res/values-xlarge/dimens.xml
+++ b/java/res/values-xlarge/dimens.xml
@@ -24,7 +24,11 @@
     <dimen name="spacebar_vertical_correction">0dip</dimen>
     <dimen name="key_text_size">28sp</dimen>
     <dimen name="key_label_text_size">16sp</dimen>
-    <dimen name="key_preview_offset">0dip</dimen>
     <dimen name="key_preview_height">40dip</dimen>
+    <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
+    <!-- key_height x 1.7 -->
+    <dimen name="mini_keyboard_slide_allowance">122.4dip</dimen>
+    <!-- -key_height x 1.0 -->
+    <dimen name="mini_keyboard_vertical_correction">-72dip</dimen>
     <dimen name="keyboard_vertical_correction">0dip</dimen>
 </resources>