Specify Key gaps by percentage
Change-Id: I4721bf831b5edbea1dd4309c6ce907544b098d62
diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
index f5e392c..ff0458c 100644
--- a/java/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
@@ -30,22 +30,25 @@
<dimen name="mini_keyboard_key_horizontal_padding">8dip</dimen>
<dimen name="keyboard_horizontal_edges_padding">0dp</dimen>
- <dimen name="keyboard_top_padding">0.02in</dimen>
- <dimen name="keyboard_bottom_padding">0.06in</dimen>
- <dimen name="key_bottom_gap">2.04mm</dimen>
- <dimen name="key_horizontal_gap">0.70mm</dimen>
+ <fraction name="keyboard_top_padding">1.556%p</fraction>
+ <fraction name="keyboard_bottom_padding">4.669%p</fraction>
+ <fraction name="key_bottom_gap">6.250%p</fraction>
+ <fraction name="key_horizontal_gap">1.352%p</fraction>
- <dimen name="key_bottom_gap_stone">2.45mm</dimen>
- <dimen name="key_horizontal_gap_stone">0.90mm</dimen>
+ <dimen name="keyboardHeight_stone">1.317in</dimen>
+ <fraction name="keyboard_top_padding_stone">1.556%p</fraction>
+ <fraction name="keyboard_bottom_padding_stone">0.778%p</fraction>
+ <fraction name="key_bottom_gap_stone">7.506%p</fraction>
+ <fraction name="key_horizontal_gap_stone">1.739%p</fraction>
- <dimen name="key_bottom_gap_gb">2.12mm</dimen>
- <dimen name="key_horizontal_gap_gb">1.02mm</dimen>
+ <fraction name="key_bottom_gap_gb">6.495%p</fraction>
+ <fraction name="key_horizontal_gap_gb">1.971%p</fraction>
- <dimen name="keyboard_top_padding_ics">0.03in</dimen>
- <dimen name="keyboard_bottom_padding_ics">0.06in</dimen>
+ <fraction name="keyboard_top_padding_ics">2.335%p</fraction>
+ <fraction name="keyboard_bottom_padding_ics">4.669%p</fraction>
+ <fraction name="key_bottom_gap_ics">6.127%p</fraction>
+ <fraction name="key_horizontal_gap_ics">1.739%p</fraction>
<dimen name="mini_keyboard_horizontal_edges_padding_ics">6dp</dimen>
- <dimen name="key_bottom_gap_ics">2.00mm</dimen>
- <dimen name="key_horizontal_gap_ics">0.90mm</dimen>
<!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
<!-- popup_key_height x 1.2 -->
diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml
index f731d01..de55cbd 100644
--- a/java/res/values/styles.xml
+++ b/java/res/values/styles.xml
@@ -22,10 +22,10 @@
<item name="maxKeyboardHeight">@fraction/maxKeyboardHeight</item>
<item name="minKeyboardHeight">@fraction/minKeyboardHeight</item>
<item name="popupKeyboardTemplate">@xml/kbd_popup_template</item>
- <item name="keyboardTopPadding">@dimen/keyboard_top_padding</item>
- <item name="keyboardBottomPadding">@dimen/keyboard_bottom_padding</item>
- <item name="horizontalGap">@dimen/key_horizontal_gap</item>
- <item name="verticalGap">@dimen/key_bottom_gap</item>
+ <item name="keyboardTopPadding">@fraction/keyboard_top_padding</item>
+ <item name="keyboardBottomPadding">@fraction/keyboard_bottom_padding</item>
+ <item name="horizontalGap">@fraction/key_horizontal_gap</item>
+ <item name="verticalGap">@fraction/key_bottom_gap</item>
<item name="maxPopupKeyboardColumn">@integer/config_max_popup_keyboard_column</item>
</style>
<style name="LatinKeyboard">
@@ -101,8 +101,11 @@
</style>
<!-- Theme "Stone" -->
<style name="Keyboard.Stone" parent="Keyboard">
- <item name="horizontalGap">@dimen/key_horizontal_gap_stone</item>
- <item name="verticalGap">@dimen/key_bottom_gap_stone</item>
+ <item name="keyboardHeight">@dimen/keyboardHeight_stone</item>
+ <item name="keyboardTopPadding">@fraction/keyboard_top_padding_stone</item>
+ <item name="keyboardBottomPadding">@fraction/keyboard_bottom_padding_stone</item>
+ <item name="horizontalGap">@fraction/key_horizontal_gap_stone</item>
+ <item name="verticalGap">@fraction/key_bottom_gap_stone</item>
</style>
<style name="LatinKeyboard.Stone" parent="LatinKeyboard">
<item name="spacebarTextColor">#FF000000</item>
@@ -129,8 +132,8 @@
</style>
<!-- Theme "Gingerbread" -->
<style name="Keyboard.Gingerbread" parent="Keyboard">
- <item name="horizontalGap">@dimen/key_horizontal_gap_gb</item>
- <item name="verticalGap">@dimen/key_bottom_gap_gb</item>
+ <item name="horizontalGap">@fraction/key_horizontal_gap_gb</item>
+ <item name="verticalGap">@fraction/key_bottom_gap_gb</item>
</style>
<style name="KeyboardView.Gingerbread" parent="KeyboardView">
<item name="android:background">@drawable/keyboard_dark_background</item>
@@ -142,10 +145,10 @@
</style>
<!-- Theme "IceCreamSandwich" -->
<style name="Keyboard.IceCreamSandwich" parent="Keyboard" >
- <item name="keyboardTopPadding">@dimen/keyboard_top_padding_ics</item>
- <item name="keyboardBottomPadding">@dimen/keyboard_bottom_padding_ics</item>
- <item name="horizontalGap">@dimen/key_horizontal_gap_ics</item>
- <item name="verticalGap">@dimen/key_bottom_gap_ics</item>
+ <item name="keyboardTopPadding">@fraction/keyboard_top_padding_ics</item>
+ <item name="keyboardBottomPadding">@fraction/keyboard_bottom_padding_ics</item>
+ <item name="horizontalGap">@fraction/key_horizontal_gap_ics</item>
+ <item name="verticalGap">@fraction/key_bottom_gap_ics</item>
</style>
<style name="LatinKeyboard.IceCreamSandwich" parent="LatinKeyboard">
<item name="disabledShortcutIcon">@drawable/sym_keyboard_voice_off_holo</item>