resolved conflicts for merge of 0325360d to master
Change-Id: I5926c8d75dbffda20001fa9487fae2e5f723c755
diff --git a/java/res/layout/keyboard_popup.xml b/java/res/layout/keyboard_popup.xml
index 27388e0..c6594f6 100644
--- a/java/res/layout/keyboard_popup.xml
+++ b/java/res/layout/keyboard_popup.xml
@@ -36,6 +36,6 @@
latin:keyBackground="@drawable/btn_keyboard_key_gingerbread_popup"
latin:keyHysteresisDistance="0dip"
- latin:verticalCorrection="-20dip"
+ latin:verticalCorrection="@dimen/mini_keyboard_vertical_correction"
/>
</LinearLayout>
diff --git a/java/res/values-land/dimens.xml b/java/res/values-land/dimens.xml
index ac0e030..1396bff 100644
--- a/java/res/values-land/dimens.xml
+++ b/java/res/values-land/dimens.xml
@@ -24,6 +24,8 @@
<dimen name="candidate_strip_fading_edge_length">63dip</dimen>
<dimen name="spacebar_vertical_correction">2dip</dimen>
<!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
- <!-- key_height * 1.7 -->
+ <!-- key_height x 1.7 -->
<dimen name="mini_keyboard_slide_allowance">79.9dip</dimen>
+ <!-- -key_height x 1.0 -->
+ <dimen name="mini_keyboard_vertical_correction">-47dip</dimen>
</resources>
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>
diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
index cad4e2a..0f716a6 100644
--- a/java/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
@@ -32,8 +32,10 @@
<dimen name="key_preview_offset">0dip</dimen>
<dimen name="key_preview_height">80dip</dimen>
<!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
- <!-- key_height * 1.7 -->
+ <!-- key_height x 1.7 -->
<dimen name="mini_keyboard_slide_allowance">91.8dip</dimen>
+ <!-- -key_height x 1.0 -->
+ <dimen name="mini_keyboard_vertical_correction">-54dip</dimen>
<dimen name="key_hysteresis_distance">0.05in</dimen>
<dimen name="keyboard_vertical_correction">-10dip</dimen>
</resources>