Update xlarge drawable of Keyboard
Bug: 3109804
Change-Id: I316f9cfcec377a7d0ea1417e1e3cea55cbdb9e2b
diff --git a/java/res/xml-xlarge/kbd_phone.xml b/java/res/xml-xlarge/kbd_phone.xml
index 977bbf2..107731f 100644
--- a/java/res/xml-xlarge/kbd_phone.xml
+++ b/java/res/xml-xlarge/kbd_phone.xml
@@ -21,8 +21,8 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="7.5%p"
- latin:horizontalGap="0px"
- latin:verticalGap="0px"
+ latin:horizontalGap="@dimen/key_horizontal_gap"
+ latin:verticalGap="@dimen/key_bottom_gap"
latin:keyHeight="@dimen/key_height"
>
<!-- This row is intentionally not marked as a top row -->
@@ -35,29 +35,35 @@
latin:keyEdgeFlags="left" />
<!-- To match one character label size with "Tab", I placed spaces around the char '-'
and '+'. -->
+ <Spacer
+ latin:horizontalGap="6.0%p" />
<Key
latin:codes="45"
- latin:keyLabel=" - "
- latin:horizontalGap="6.0%p" />
+ latin:keyLabel=" - " />
<Key
latin:codes="43"
latin:keyLabel=" + " />
+ <Spacer
+ latin:horizontalGap="11.5%p" />
<Key
latin:codes="49"
latin:keyIcon="@drawable/sym_keyboard_num1"
- latin:horizontalGap="11.5%p" />
+ latin:keyWidth="10.5%p " />
<Key
latin:codes="50"
- latin:keyIcon="@drawable/sym_keyboard_num2" />
+ latin:keyIcon="@drawable/sym_keyboard_num2"
+ latin:keyWidth="10.5%p " />
<Key
latin:codes="51"
- latin:keyIcon="@drawable/sym_keyboard_num3" />
+ latin:keyIcon="@drawable/sym_keyboard_num3"
+ latin:keyWidth="10.5%p " />
+ <Spacer
+ latin:horizontalGap="6.0%p" />
<Key
latin:codes="@integer/key_delete"
latin:keyIcon="@drawable/sym_keyboard_delete"
latin:iconPreview="@drawable/sym_keyboard_feedback_delete"
latin:keyWidth="15.0%p"
- latin:horizontalGap="6.0%p"
latin:isModifier="true"
latin:isRepeatable="true"
latin:keyEdgeFlags="right" />
@@ -72,29 +78,35 @@
latin:keyEdgeFlags="left" />
<!-- To match one character label size with "More", I placed spaces around the char ','
and '.'. -->
+ <Spacer
+ latin:horizontalGap="6.0%p" />
<Key
latin:codes="44"
- latin:keyLabel=" , "
- latin:horizontalGap="6.0%p" />
+ latin:keyLabel=" , " />
<Key
latin:codes="46"
latin:keyLabel=" . " />
+ <Spacer
+ latin:horizontalGap="11.5%p" />
<Key
latin:codes="52"
latin:keyIcon="@drawable/sym_keyboard_num4"
- latin:horizontalGap="11.5%p" />
+ latin:keyWidth="10.5%p " />
<Key
latin:codes="53"
- latin:keyIcon="@drawable/sym_keyboard_num5" />
+ latin:keyIcon="@drawable/sym_keyboard_num5"
+ latin:keyWidth="10.5%p " />
<Key
latin:codes="54"
- latin:keyIcon="@drawable/sym_keyboard_num6" />
+ latin:keyIcon="@drawable/sym_keyboard_num6"
+ latin:keyWidth="10.5%p " />
+ <Spacer
+ latin:horizontalGap="6.0%p" />
<Key
latin:codes="@integer/key_return"
latin:keyIcon="@drawable/sym_keyboard_return"
latin:iconPreview="@drawable/sym_keyboard_feedback_return"
latin:keyWidth="15.0%p"
- latin:horizontalGap="6.0%p"
latin:isModifier="true"
latin:keyEdgeFlags="right" />
</Row>
@@ -103,47 +115,57 @@
and ')'. -->
<!-- There is an empty area bellow the "More" key and left of the "(" key. To ignore
the touch event on the area, "(" is intentionally not marked as a left edge key. -->
+ <Spacer
+ latin:horizontalGap="21.0%p" />
<Key
latin:codes="40"
- latin:keyLabel=" ( "
- latin:horizontalGap="21.0%p" />
+ latin:keyLabel=" ( " />
<Key
latin:codes="41"
latin:keyLabel=" ) " />
+ <Spacer
+ latin:horizontalGap="11.5%p" />
<Key
latin:codes="55"
latin:keyIcon="@drawable/sym_keyboard_num7"
- latin:horizontalGap="11.5%p" />
+ latin:keyWidth="10.5%p " />
<Key
latin:codes="56"
- latin:keyIcon="@drawable/sym_keyboard_num8" />
- <!-- There is an empty area bellow the "Enter" key and right of the "9" key. To ignore
- the touch event on the area, "9" is intentionally not marked as a right edge key. -->
+ latin:keyIcon="@drawable/sym_keyboard_num8"
+ latin:keyWidth="10.5%p " />
<Key
latin:codes="57"
- latin:keyIcon="@drawable/sym_keyboard_num9" />
- </Row>
+ latin:keyIcon="@drawable/sym_keyboard_num9"
+ latin:keyWidth="10.5%p " />
+ <!-- There is an empty area bellow the "Enter" key and right of the "9" key. To ignore
+ the touch event on the area, "9" is intentionally not marked as a right edge key. -->
+ </Row>
<!-- This row is intentionally not marked as a bottom row -->
<Row>
<!-- There is an empty area bellow the "More" key and left of the "space" key. To ignore
the touch event on the area, "space" is intentionally not marked as a left edge key. -->
+ <Spacer
+ latin:horizontalGap="21.0%p" />
<Key
latin:codes="@integer/key_space"
latin:keyIcon="@drawable/sym_keyboard_space"
latin:iconPreview="@drawable/sym_keyboard_feedback_space"
- latin:keyWidth="15.0%p"
- latin:horizontalGap="21.0%p " />
+ latin:keyWidth="15.0%p" />
+ <Spacer
+ latin:horizontalGap="11.5%p" />
<Key
latin:codes="42"
latin:keyIcon="@drawable/sym_keyboard_numstar"
- latin:horizontalGap="11.5%p" />
+ latin:keyWidth="10.5%p " />
<Key
latin:codes="48"
- latin:keyIcon="@drawable/sym_keyboard_num0" />
- <!-- There is an empty area bellow the "Enter" key and right of the "#" key. To ignore
- the touch event on the area, "#" is intentionally not marked as a right edge key. -->
+ latin:keyIcon="@drawable/sym_keyboard_num0"
+ latin:keyWidth="10.5%p " />
<Key
latin:codes="35"
- latin:keyIcon="@drawable/sym_keyboard_numpound" />
+ latin:keyIcon="@drawable/sym_keyboard_numpound"
+ latin:keyWidth="10.5%p " />
+ <!-- There is an empty area bellow the "Enter" key and right of the "#" key. To ignore
+ the touch event on the area, "#" is intentionally not marked as a right edge key. -->
</Row>
</Keyboard>
diff --git a/java/res/xml-xlarge/kbd_phone_symbols.xml b/java/res/xml-xlarge/kbd_phone_symbols.xml
index 6fbf3a9..a7dcd32 100644
--- a/java/res/xml-xlarge/kbd_phone_symbols.xml
+++ b/java/res/xml-xlarge/kbd_phone_symbols.xml
@@ -21,8 +21,8 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="7.5%p"
- latin:horizontalGap="0px"
- latin:verticalGap="0px"
+ latin:horizontalGap="@dimen/key_horizontal_gap"
+ latin:verticalGap="@dimen/key_bottom_gap"
latin:keyHeight="@dimen/key_height"
>
<!-- This row is intentionally not marked as a top row -->
@@ -33,10 +33,11 @@
latin:keyWidth="15.0%p"
latin:isModifier="true"
latin:keyEdgeFlags="left" />
+ <Spacer
+ latin:horizontalGap="4.0%p" />
<Key
latin:codes="44"
- latin:keyLabel="@string/label_pause_key"
- latin:horizontalGap="4.0%p" />
+ latin:keyLabel="@string/label_pause_key" />
<!-- To match one character label size with "Tab" and "Pause, I placed spaces around the
char '-' and '+'. -->
<Key
@@ -45,22 +46,27 @@
<Key
latin:codes="43"
latin:keyLabel=" + " />
+ <Spacer
+ latin:horizontalGap="6.0%p" />
<Key
latin:codes="49"
latin:keyIcon="@drawable/sym_keyboard_num1"
- latin:horizontalGap="6.0%p" />
+ latin:keyWidth="10.5%p " />
<Key
latin:codes="50"
- latin:keyIcon="@drawable/sym_keyboard_num2" />
+ latin:keyIcon="@drawable/sym_keyboard_num2"
+ latin:keyWidth="10.5%p " />
<Key
latin:codes="51"
- latin:keyIcon="@drawable/sym_keyboard_num3" />
+ latin:keyIcon="@drawable/sym_keyboard_num3"
+ latin:keyWidth="10.5%p " />
+ <Spacer
+ latin:horizontalGap="6.0%p" />
<Key
latin:codes="@integer/key_delete"
latin:keyIcon="@drawable/sym_keyboard_delete"
latin:iconPreview="@drawable/sym_keyboard_feedback_delete"
latin:keyWidth="15.0%p"
- latin:horizontalGap="6.0%p"
latin:isModifier="true"
latin:isRepeatable="true"
latin:keyEdgeFlags="right" />
@@ -73,10 +79,11 @@
latin:isModifier="true"
latin:isSticky="true"
latin:keyEdgeFlags="left" />
+ <Spacer
+ latin:horizontalGap="4.0%p" />
<Key
latin:codes="59"
- latin:keyLabel="@string/label_wait_key"
- latin:horizontalGap="4.0%p" />
+ latin:keyLabel="@string/label_wait_key" />
<!-- To match one character label size with "More" and "Wait", I placed spaces around the
char ',' and '.'. -->
<Key
@@ -85,22 +92,27 @@
<Key
latin:codes="46"
latin:keyLabel=" . " />
+ <Spacer
+ latin:horizontalGap="6.0%p" />
<Key
latin:codes="52"
latin:keyIcon="@drawable/sym_keyboard_num4"
- latin:horizontalGap="6.0%p" />
+ latin:keyWidth="10.5%p " />
<Key
latin:codes="53"
- latin:keyIcon="@drawable/sym_keyboard_num5" />
+ latin:keyIcon="@drawable/sym_keyboard_num5"
+ latin:keyWidth="10.5%p " />
<Key
latin:codes="54"
- latin:keyIcon="@drawable/sym_keyboard_num6" />
+ latin:keyIcon="@drawable/sym_keyboard_num6"
+ latin:keyWidth="10.5%p " />
+ <Spacer
+ latin:horizontalGap="6.0%p" />
<Key
latin:codes="@integer/key_return"
latin:keyIcon="@drawable/sym_keyboard_return"
latin:iconPreview="@drawable/sym_keyboard_feedback_return"
latin:keyWidth="15.0%p"
- latin:horizontalGap="6.0%p"
latin:isModifier="true"
latin:keyEdgeFlags="right" />
</Row>
@@ -109,50 +121,60 @@
char 'N', '(' and ')'. -->
<!-- There is an empty area bellow the "More" key and left of the "(" key. To ignore
the touch event on the area, "(" is intentionally not marked as a left edge key. -->
+ <Spacer
+ latin:horizontalGap="19.0%p" />
<Key
latin:codes="78"
- latin:keyLabel=" N "
- latin:horizontalGap="19.0%p" />
+ latin:keyLabel=" N " />
<Key
latin:codes="40"
latin:keyLabel=" ( " />
<Key
latin:codes="41"
latin:keyLabel=" ) " />
+ <Spacer
+ latin:horizontalGap="6.0%p" />
<Key
latin:codes="55"
latin:keyIcon="@drawable/sym_keyboard_num7"
- latin:horizontalGap="6.0%p" />
+ latin:keyWidth="10.5%p " />
<Key
latin:codes="56"
- latin:keyIcon="@drawable/sym_keyboard_num8" />
- <!-- There is an empty area bellow the "Enter" key and right of the "9" key. To ignore
- the touch event on the area, "9" is intentionally not marked as a right edge key. -->
+ latin:keyIcon="@drawable/sym_keyboard_num8"
+ latin:keyWidth="10.5%p " />
<Key
latin:codes="57"
- latin:keyIcon="@drawable/sym_keyboard_num9" />
+ latin:keyIcon="@drawable/sym_keyboard_num9"
+ latin:keyWidth="10.5%p " />
+ <!-- There is an empty area bellow the "Enter" key and right of the "9" key. To ignore
+ the touch event on the area, "9" is intentionally not marked as a right edge key. -->
</Row>
<!-- This row is intentionally not marked as a bottom row -->
<Row>
<!-- There is an empty area bellow the "More" key and left of the "space" key. To ignore
the touch event on the area, "space" is intentionally not marked as a left edge key. -->
+ <Spacer
+ latin:horizontalGap="19.0%p" />
<Key
latin:codes="@integer/key_space"
latin:keyIcon="@drawable/sym_keyboard_space"
latin:iconPreview="@drawable/sym_keyboard_feedback_space"
- latin:keyWidth="22.5%p"
- latin:horizontalGap="19.0%p " />
+ latin:keyWidth="22.5%p" />
+ <Spacer
+ latin:horizontalGap="6.0%p" />
<Key
latin:codes="42"
latin:keyIcon="@drawable/sym_keyboard_numstar"
- latin:horizontalGap="6.0%p" />
+ latin:keyWidth="10.5%p " />
<Key
latin:codes="48"
- latin:keyIcon="@drawable/sym_keyboard_num0" />
- <!-- There is an empty area bellow the "Enter" key and right of the "#" key. To ignore
- the touch event on the area, "#" is intentionally not marked as a right edge key. -->
+ latin:keyIcon="@drawable/sym_keyboard_num0"
+ latin:keyWidth="10.5%p " />
<Key
latin:codes="35"
- latin:keyIcon="@drawable/sym_keyboard_numpound" />
+ latin:keyIcon="@drawable/sym_keyboard_numpound"
+ latin:keyWidth="10.5%p " />
+ <!-- There is an empty area bellow the "Enter" key and right of the "#" key. To ignore
+ the touch event on the area, "#" is intentionally not marked as a right edge key. -->
</Row>
</Keyboard>
diff --git a/java/res/xml-xlarge/kbd_popup_template.xml b/java/res/xml-xlarge/kbd_popup_template.xml
index 382d90a..55ebda5 100644
--- a/java/res/xml-xlarge/kbd_popup_template.xml
+++ b/java/res/xml-xlarge/kbd_popup_template.xml
@@ -20,7 +20,7 @@
<Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="7.5%p"
- latin:horizontalGap="0px"
+ latin:horizontalGap="@dimen/key_horizontal_gap"
latin:verticalGap="0px"
latin:keyHeight="@dimen/key_height"
>
diff --git a/java/res/xml-xlarge/kbd_qwerty.xml b/java/res/xml-xlarge/kbd_qwerty.xml
index b725034..9485ca7 100644
--- a/java/res/xml-xlarge/kbd_qwerty.xml
+++ b/java/res/xml-xlarge/kbd_qwerty.xml
@@ -21,7 +21,7 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="7.5%p"
- latin:horizontalGap="0px"
+ latin:horizontalGap="@dimen/key_horizontal_gap"
latin:verticalGap="@dimen/key_bottom_gap"
latin:keyHeight="@dimen/key_height"
>
@@ -30,62 +30,63 @@
<Key
latin:codes="@integer/key_tab"
latin:keyLabel="Tab"
+ latin:keyWidth="7.0%p"
latin:isModifier="true"
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="q"
- latin:keyHintIcon="@drawable/keyboard_hint_1"
+ latin:keyHintIcon="@drawable/key_hint_1_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_q" />
<Key
latin:keyLabel="w"
- latin:keyHintIcon="@drawable/keyboard_hint_2"
+ latin:keyHintIcon="@drawable/key_hint_2_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_w" />
<Key
latin:keyLabel="e"
- latin:keyHintIcon="@drawable/keyboard_hint_3"
+ latin:keyHintIcon="@drawable/key_hint_3_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_e" />
<Key
latin:keyLabel="r"
- latin:keyHintIcon="@drawable/keyboard_hint_4"
+ latin:keyHintIcon="@drawable/key_hint_4_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_r" />
<Key
latin:keyLabel="t"
- latin:keyHintIcon="@drawable/keyboard_hint_5"
+ latin:keyHintIcon="@drawable/key_hint_5_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_t" />
<Key
latin:keyLabel="y"
- latin:keyHintIcon="@drawable/keyboard_hint_6"
+ latin:keyHintIcon="@drawable/key_hint_6_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_y" />
<Key
latin:keyLabel="u"
- latin:keyHintIcon="@drawable/keyboard_hint_7"
+ latin:keyHintIcon="@drawable/key_hint_7_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_u" />
<Key
latin:keyLabel="i"
- latin:keyHintIcon="@drawable/keyboard_hint_8"
+ latin:keyHintIcon="@drawable/key_hint_8_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_i" />
<Key
latin:keyLabel="o"
- latin:keyHintIcon="@drawable/keyboard_hint_9"
+ latin:keyHintIcon="@drawable/key_hint_9_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_o" />
<Key
latin:keyLabel="p"
- latin:keyHintIcon="@drawable/keyboard_hint_0"
+ latin:keyHintIcon="@drawable/key_hint_0_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_p" />
<Key
latin:keyLabel="="
latin:temporaryShiftKeyLabel="+"
- latin:keyHintIcon="@drawable/keyboard_hint_plus"
+ latin:keyHintIcon="@drawable/key_hint_plus_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="+" />
<Key
@@ -138,13 +139,13 @@
<Key
latin:keyLabel=";"
latin:temporaryShiftKeyLabel=":"
- latin:keyHintIcon="@drawable/keyboard_hint_colon"
+ latin:keyHintIcon="@drawable/key_hint_colon_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters=":" />
<Key
latin:keyLabel="\'"
latin:temporaryShiftKeyLabel="""
- latin:keyHintIcon="@drawable/keyboard_hint_quote"
+ latin:keyHintIcon="@drawable/key_hint_quote_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters=""" />
<Key
@@ -195,13 +196,13 @@
<Key
latin:keyLabel=";"
latin:temporaryShiftKeyLabel=":"
- latin:keyHintIcon="@drawable/keyboard_hint_colon"
+ latin:keyHintIcon="@drawable/key_hint_colon_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters=":" />
<Key
latin:keyLabel="\'"
latin:temporaryShiftKeyLabel="""
- latin:keyHintIcon="@drawable/keyboard_hint_quote"
+ latin:keyHintIcon="@drawable/key_hint_quote_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters=""" />
<Key
@@ -254,7 +255,7 @@
<Key
latin:keyLabel="\'"
latin:temporaryShiftKeyLabel="""
- latin:keyHintIcon="@drawable/keyboard_hint_quote"
+ latin:keyHintIcon="@drawable/key_hint_quote_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters=""" />
<Key
@@ -305,13 +306,13 @@
<Key
latin:keyLabel=";"
latin:temporaryShiftKeyLabel=":"
- latin:keyHintIcon="@drawable/keyboard_hint_colon"
+ latin:keyHintIcon="@drawable/key_hint_colon_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters=":" />
<Key
latin:keyLabel="\'"
latin:temporaryShiftKeyLabel="""
- latin:keyHintIcon="@drawable/keyboard_hint_quote"
+ latin:keyHintIcon="@drawable/key_hint_quote_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters=""" />
<Key
@@ -362,13 +363,13 @@
<Key
latin:keyLabel=";"
latin:temporaryShiftKeyLabel=":"
- latin:keyHintIcon="@drawable/keyboard_hint_colon"
+ latin:keyHintIcon="@drawable/key_hint_colon_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters=":" />
<Key
latin:keyLabel="\'"
latin:temporaryShiftKeyLabel="""
- latin:keyHintIcon="@drawable/keyboard_hint_quote"
+ latin:keyHintIcon="@drawable/key_hint_quote_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters=""" />
<Key
@@ -415,19 +416,19 @@
<Key
latin:keyLabel=","
latin:temporaryShiftKeyLabel="*"
- latin:keyHintIcon="@drawable/keyboard_hint_star"
+ latin:keyHintIcon="@drawable/key_hint_star_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="*" />
<Key
latin:keyLabel="."
latin:temporaryShiftKeyLabel="!"
- latin:keyHintIcon="@drawable/keyboard_hint_exclamation"
+ latin:keyHintIcon="@drawable/key_hint_exclamation_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="!" />
<Key
latin:keyLabel="/"
latin:temporaryShiftKeyLabel="\?"
- latin:keyHintIcon="@drawable/keyboard_hint_question"
+ latin:keyHintIcon="@drawable/key_hint_question_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="\?" />
<Key
@@ -475,19 +476,19 @@
<Key
latin:keyLabel=","
latin:temporaryShiftKeyLabel="*"
- latin:keyHintIcon="@drawable/keyboard_hint_star"
+ latin:keyHintIcon="@drawable/key_hint_star_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="*" />
<Key
latin:keyLabel="."
latin:temporaryShiftKeyLabel="!"
- latin:keyHintIcon="@drawable/keyboard_hint_exclamation"
+ latin:keyHintIcon="@drawable/key_hint_exclamation_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="!" />
<Key
latin:keyLabel="/"
latin:temporaryShiftKeyLabel="\?"
- latin:keyHintIcon="@drawable/keyboard_hint_question"
+ latin:keyHintIcon="@drawable/key_hint_question_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="\?" />
<Key
@@ -583,19 +584,19 @@
<Key
latin:keyLabel=","
latin:temporaryShiftKeyLabel="*"
- latin:keyHintIcon="@drawable/keyboard_hint_star"
+ latin:keyHintIcon="@drawable/key_hint_star_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="*" />
<Key
latin:keyLabel="."
latin:temporaryShiftKeyLabel="!"
- latin:keyHintIcon="@drawable/keyboard_hint_exclamation"
+ latin:keyHintIcon="@drawable/key_hint_exclamation_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="!" />
<Key
latin:keyLabel="/"
latin:temporaryShiftKeyLabel="\?"
- latin:keyHintIcon="@drawable/keyboard_hint_question"
+ latin:keyHintIcon="@drawable/key_hint_question_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="\?" />
<Key
@@ -643,19 +644,19 @@
<Key
latin:keyLabel=","
latin:temporaryShiftKeyLabel="*"
- latin:keyHintIcon="@drawable/keyboard_hint_star"
+ latin:keyHintIcon="@drawable/key_hint_star_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="*" />
<Key
latin:keyLabel="."
latin:temporaryShiftKeyLabel="!"
- latin:keyHintIcon="@drawable/keyboard_hint_exclamation"
+ latin:keyHintIcon="@drawable/key_hint_exclamation_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="!" />
<Key
latin:keyLabel="/"
latin:temporaryShiftKeyLabel="\?"
- latin:keyHintIcon="@drawable/keyboard_hint_question"
+ latin:keyHintIcon="@drawable/key_hint_question_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="\?" />
<Key
@@ -671,17 +672,18 @@
<Row
latin:keyboardMode="@+id/mode_normal"
>
+ <Spacer
+ latin:horizontalGap="16.25%p" />
<Key
latin:keyLabel="("
latin:temporaryShiftKeyLabel="<"
- latin:keyHintIcon="@drawable/keyboard_hint_smaller"
+ latin:keyHintIcon="@drawable/key_hint_smaller_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
- latin:popupCharacters="<"
- latin:horizontalGap="16.25%p" />
+ latin:popupCharacters="<" />
<Key
latin:keyLabel=")"
latin:temporaryShiftKeyLabel=">"
- latin:keyHintIcon="@drawable/keyboard_hint_greater"
+ latin:keyHintIcon="@drawable/key_hint_larger_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters=">" />
<Key
@@ -693,7 +695,7 @@
<Key
latin:keyLabel="_"
latin:temporaryShiftKeyLabel="\@"
- latin:keyHintIcon="@drawable/keyboard_hint_at"
+ latin:keyHintIcon="@drawable/key_hint_at_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="\@" />
<Key
@@ -706,11 +708,12 @@
<Row
latin:keyboardMode="@+id/mode_url"
>
+ <Spacer
+ latin:horizontalGap="16.25%p" />
<Key
latin:keyLabel=".com"
- latin:keyOutputText=".com"
- latin:keyWidth="15.0%p"
- latin:horizontalGap="16.25%p" />
+ latin:keyOutputText=".com"
+ latin:keyWidth="15.0%p" />
<Key
latin:codes="@integer/key_space"
latin:keyIcon="@drawable/sym_keyboard_space"
@@ -720,7 +723,7 @@
<Key
latin:keyLabel="_"
latin:temporaryShiftKeyLabel="\@"
- latin:keyHintIcon="@drawable/keyboard_hint_at"
+ latin:keyHintIcon="@drawable/key_hint_at_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="\@" />
<Key
@@ -733,11 +736,12 @@
<Row
latin:keyboardMode="@+id/mode_email"
>
+ <Spacer
+ latin:horizontalGap="16.25%p" />
<Key
latin:keyLabel=".com"
- latin:keyOutputText=".com"
- latin:keyWidth="15.0%p"
- latin:horizontalGap="16.25%p" />
+ latin:keyOutputText=".com"
+ latin:keyWidth="15.0%p" />
<Key
latin:codes="@integer/key_space"
latin:keyIcon="@drawable/sym_keyboard_space"
@@ -752,12 +756,13 @@
<Row
latin:keyboardMode="@+id/mode_im"
>
+ <Spacer
+ latin:horizontalGap="16.25%p" />
<Key
latin:keyLabel=":-)"
latin:keyOutputText=":-)"
latin:popupKeyboard="@xml/popup_smileys"
- latin:keyWidth="15.0%p"
- latin:horizontalGap="16.25%p" />
+ latin:keyWidth="15.0%p" />
<Key
latin:codes="@integer/key_space"
latin:keyIcon="@drawable/sym_keyboard_space"
@@ -767,7 +772,7 @@
<Key
latin:keyLabel="_"
latin:temporaryShiftKeyLabel="\@"
- latin:keyHintIcon="@drawable/keyboard_hint_at"
+ latin:keyHintIcon="@drawable/key_hint_at_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="\@" />
<Key
@@ -780,17 +785,18 @@
<Row
latin:keyboardMode="@+id/mode_webentry"
>
+ <Spacer
+ latin:horizontalGap="16.25%p" />
<Key
latin:keyLabel="("
latin:temporaryShiftKeyLabel="<"
- latin:keyHintIcon="@drawable/keyboard_hint_smaller"
+ latin:keyHintIcon="@drawable/key_hint_smaller_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
- latin:popupCharacters="<"
- latin:horizontalGap="16.25%p" />
+ latin:popupCharacters="<" />
<Key
latin:keyLabel=")"
latin:temporaryShiftKeyLabel=">"
- latin:keyHintIcon="@drawable/keyboard_hint_greater"
+ latin:keyHintIcon="@drawable/key_hint_larger_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters=">" />
<Key
@@ -802,7 +808,7 @@
<Key
latin:keyLabel="_"
latin:temporaryShiftKeyLabel="\@"
- latin:keyHintIcon="@drawable/keyboard_hint_at"
+ latin:keyHintIcon="@drawable/key_hint_at_holo"
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="\@" />
<Key
diff --git a/java/res/xml-xlarge/kbd_symbols.xml b/java/res/xml-xlarge/kbd_symbols.xml
index e570ff4..34fc114 100644
--- a/java/res/xml-xlarge/kbd_symbols.xml
+++ b/java/res/xml-xlarge/kbd_symbols.xml
@@ -21,8 +21,8 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="7.5%p"
- latin:horizontalGap="0px"
- latin:verticalGap="0px"
+ latin:horizontalGap="@dimen/key_horizontal_gap"
+ latin:verticalGap="@dimen/key_bottom_gap"
latin:keyHeight="@dimen/key_height"
>
<!-- This row is intentionally not marked as a top row -->
@@ -30,6 +30,7 @@
<Key
latin:codes="@integer/key_tab"
latin:keyLabel="Tab"
+ latin:keyWidth="7.0%p"
latin:isModifier="true"
latin:keyEdgeFlags="left" />
<Key
@@ -140,10 +141,11 @@
</Row>
<!-- This row is intentionally not marked as a bottom row -->
<Row>
- <Key
- latin:keyLabel="<"
+ <Spacer
latin:horizontalGap="16.25%p" />
<Key
+ latin:keyLabel="<" />
+ <Key
latin:keyLabel=">" />
<Key
latin:codes="@integer/key_space"
diff --git a/java/res/xml-xlarge/kbd_symbols_shift.xml b/java/res/xml-xlarge/kbd_symbols_shift.xml
index 5ca2cc1..8ed1c11 100644
--- a/java/res/xml-xlarge/kbd_symbols_shift.xml
+++ b/java/res/xml-xlarge/kbd_symbols_shift.xml
@@ -21,8 +21,8 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="7.5%p"
- latin:horizontalGap="0px"
- latin:verticalGap="0px"
+ latin:horizontalGap="@dimen/key_horizontal_gap"
+ latin:verticalGap="@dimen/key_bottom_gap"
latin:keyHeight="@dimen/key_height"
>
<!-- This row is intentionally not marked as a top row -->
@@ -30,6 +30,7 @@
<Key
latin:codes="@integer/key_tab"
latin:keyLabel="Tab"
+ latin:keyWidth="7.0%p"
latin:isModifier="true"
latin:keyEdgeFlags="left" />
<Key
@@ -140,10 +141,11 @@
</Row>
<!-- This row is intentionally not marked as a bottom row -->
<Row>
- <Key
- latin:keyLabel="≤"
+ <Spacer
latin:horizontalGap="16.25%p" />
<Key
+ latin:keyLabel="≤" />
+ <Key
latin:keyLabel="≥" />
<Key
latin:codes="@integer/key_space"