diff options
Diffstat (limited to 'java/res/xml-sw600dp')
23 files changed, 585 insertions, 589 deletions
diff --git a/java/res/xml-sw600dp/kbd_key_styles.xml b/java/res/xml-sw600dp/kbd_key_styles.xml index 082c374e8..dbff293ba 100644 --- a/java/res/xml-sw600dp/kbd_key_styles.xml +++ b/java/res/xml-sw600dp/kbd_key_styles.xml @@ -22,150 +22,70 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <!-- Base key style for the functional key --> - <switch> - <case - latin:colorScheme="white" - > - <key-style - latin:styleName="functionalKeyStyle" - latin:isModifier="true" /> - </case> - <case - latin:colorScheme="black" - > - <key-style - latin:styleName="functionalKeyStyle" /> - </case> - </switch> - <!-- Base key style for the key which may have settings key as popup key --> - <switch> - <case - latin:clobberSettingsKey="true" - > - <key-style - latin:styleName="settingsPopupStyle" - latin:parentStyle="functionalKeyStyle" /> - </case> - <default> - <key-style - latin:styleName="settingsPopupStyle" - latin:keyHintIcon="@drawable/hint_popup_holo" - latin:popupCharacters="\@drawable/sym_keyboard_settings_holo|\@integer/key_settings" - latin:parentStyle="functionalKeyStyle" /> - </default> - </switch> + <key-style + latin:styleName="functionalKeyStyle" + latin:isFunctional="true" /> <!-- Functional key styles --> + <key-style + latin:styleName="shiftKeyStyle" + latin:code="@integer/key_shift" + latin:keyIcon="iconShiftKey" + latin:keyIconShifted="iconShiftedShiftKey" + latin:parentStyle="functionalKeyStyle" + latin:isSticky="true" /> + <key-style + latin:styleName="deleteKeyStyle" + latin:code="@integer/key_delete" + latin:keyIcon="iconDeleteKey" + latin:parentStyle="functionalKeyStyle" + latin:isRepeatable="true" /> + <key-style + latin:styleName="returnKeyStyle" + latin:code="@integer/key_return" + latin:keyIcon="iconReturnKey" + latin:parentStyle="functionalKeyStyle" /> + <key-style + latin:styleName="spaceKeyStyle" + latin:code="@integer/key_space" + latin:keyIconPreview="iconPreviewSpaceKey" /> + <key-style + latin:styleName="nonSpecialBackgroundSpaceKeyStyle" + latin:code="@integer/key_space" + latin:keyIconPreview="iconPreviewSpaceKey" /> + <key-style + latin:styleName="smileyKeyStyle" + latin:keyLabel=":-)" + latin:keyOutputText=":-) " + latin:keyLabelOption="popupHint" + latin:popupCharacters="@string/alternates_for_smiley" + latin:maxPopupKeyboardColumn="5" /> <switch> <case - latin:colorScheme="white" + latin:voiceKeyEnabled="true" > <key-style - latin:styleName="shiftKeyStyle" - latin:code="@integer/key_shift" - latin:keyIcon="@drawable/sym_keyboard_shift_holo" - latin:shiftedIcon="@drawable/sym_keyboard_shift_locked_holo" - latin:iconPreview="@drawable/sym_keyboard_feedback_shift" - latin:parentStyle="functionalKeyStyle" - latin:isSticky="true" /> - <key-style - latin:styleName="deleteKeyStyle" - latin:code="@integer/key_delete" - latin:keyIcon="@drawable/sym_keyboard_delete_holo" - latin:iconPreview="@drawable/sym_keyboard_feedback_delete" - latin:parentStyle="functionalKeyStyle" - latin:isRepeatable="true" /> - <key-style - latin:styleName="returnKeyStyle" - latin:code="@integer/key_return" - latin:keyIcon="@drawable/sym_keyboard_return_holo" - latin:iconPreview="@drawable/sym_keyboard_feedback_return" - latin:parentStyle="functionalKeyStyle" /> - <key-style - latin:styleName="spaceKeyStyle" - latin:code="@integer/key_space" - latin:iconPreview="@drawable/sym_keyboard_feedback_space" /> - <key-style - latin:styleName="nonSpecialBackgroundSpaceKeyStyle" - latin:code="@integer/key_space" - latin:iconPreview="@drawable/sym_keyboard_feedback_space" /> - <key-style - latin:styleName="smileyKeyStyle" - latin:keyLabel=":-)" - latin:keyOutputText=":-) " - latin:keyHintIcon="@drawable/hint_popup_holo" - latin:popupCharacters="@string/alternates_for_smiley" - latin:maxPopupKeyboardColumn="5" /> - <key-style - latin:styleName="micKeyStyle" - latin:code="@integer/key_voice" - latin:keyIcon="@drawable/sym_keyboard_voice_holo" - latin:iconPreview="@drawable/sym_keyboard_feedback_mic" - latin:parentStyle="settingsPopupStyle" /> - <key-style - latin:styleName="settingsKeyStyle" - latin:code="@integer/key_settings" - latin:keyIcon="@drawable/sym_keyboard_settings_holo" - latin:iconPreview="@drawable/sym_keyboard_feedback_settings" + latin:styleName="shortcutOrSettingsKeyStyle" + latin:code="@integer/key_shortcut" + latin:keyIcon="iconShortcutKey" + latin:keyIconPreview="iconPreviewShortcutKey" + latin:keyLabelOption="popupHint" + latin:popupCharacters="\@icon/5|\@integer/key_settings" latin:parentStyle="functionalKeyStyle" /> </case> - <case - latin:colorScheme="black" - > - <key-style - latin:styleName="shiftKeyStyle" - latin:code="@integer/key_shift" - latin:keyIcon="@drawable/sym_bkeyboard_shift" - latin:shiftedIcon="@drawable/sym_bkeyboard_shift_locked" - latin:iconPreview="@drawable/sym_keyboard_feedback_shift" - latin:parentStyle="functionalKeyStyle" - latin:isSticky="true" /> - <key-style - latin:styleName="deleteKeyStyle" - latin:code="@integer/key_delete" - latin:keyIcon="@drawable/sym_bkeyboard_delete" - latin:iconPreview="@drawable/sym_keyboard_feedback_delete" - latin:parentStyle="functionalKeyStyle" - latin:isRepeatable="true" /> - <key-style - latin:styleName="returnKeyStyle" - latin:code="@integer/key_return" - latin:keyIcon="@drawable/sym_bkeyboard_return" - latin:iconPreview="@drawable/sym_keyboard_feedback_return" - latin:parentStyle="functionalKeyStyle" /> - <key-style - latin:styleName="spaceKeyStyle" - latin:code="@integer/key_space" - latin:iconPreview="@drawable/sym_keyboard_feedback_space" /> - <key-style - latin:styleName="nonSpecialBackgroundSpaceKeyStyle" - latin:code="@integer/key_space" - latin:iconPreview="@drawable/sym_keyboard_feedback_space" /> - <key-style - latin:styleName="smileyKeyStyle" - latin:keyLabel=":-)" - latin:keyOutputText=":-) " - latin:keyHintIcon="@drawable/hint_popup_holo" - latin:popupCharacters="@string/alternates_for_smiley" - latin:maxPopupKeyboardColumn="5" /> - <key-style - latin:styleName="micKeyStyle" - latin:code="@integer/key_voice" - latin:keyIcon="@drawable/sym_bkeyboard_mic" - latin:iconPreview="@drawable/sym_keyboard_feedback_mic" - latin:parentStyle="settingsPopupStyle" /> + <default> <key-style - latin:styleName="settingsKeyStyle" + latin:styleName="shortcutOrSettingsKeyStyle" latin:code="@integer/key_settings" - latin:keyIcon="@drawable/sym_bkeyboard_settings" - latin:iconPreview="@drawable/sym_keyboard_feedback_settings" + latin:keyIcon="iconSettingsKey" + latin:keyIconPreview="iconPreviewSettingsKey" latin:parentStyle="functionalKeyStyle" /> - </case> + </default> </switch> <key-style latin:styleName="tabKeyStyle" latin:code="@integer/key_tab" - latin:keyIcon="@drawable/sym_keyboard_tab_holo" - latin:iconPreview="@drawable/sym_keyboard_tab_holo" + latin:keyIcon="iconTabKey" + latin:keyIconPreview="iconPreviewTabKey" latin:parentStyle="functionalKeyStyle" /> <key-style latin:styleName="toSymbolKeyStyle" @@ -189,9 +109,8 @@ <key-style latin:styleName="comKeyStyle" latin:keyLabel="@string/keylabel_for_popular_domain" - latin:keyLabelOption="fontNormal" + latin:keyLabelOption="fontNormal|popupHint" latin:keyOutputText="@string/keylabel_for_popular_domain" - latin:keyHintIcon="@drawable/hint_popup_holo" latin:popupCharacters="@string/alternates_for_popular_domain" /> <switch> <case diff --git a/java/res/xml-sw600dp/kbd_number.xml b/java/res/xml-sw600dp/kbd_number.xml index f0972b39c..42d7d0777 100644 --- a/java/res/xml-sw600dp/kbd_number.xml +++ b/java/res/xml-sw600dp/kbd_number.xml @@ -20,14 +20,7 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardHeight="@dimen/keyboardHeight" - latin:maxKeyboardHeight="50%p" - latin:rowHeight="25%p" latin:keyWidth="16.75%p" - latin:horizontalGap="@dimen/key_horizontal_gap" - latin:verticalGap="@dimen/key_bottom_gap" - latin:popupKeyboardTemplate="@xml/kbd_popup_template" - latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_key_styles" /> @@ -48,8 +41,8 @@ latin:keyStyle="num3KeyStyle" /> <Key latin:keyStyle="deleteKeyStyle" - latin:keyXPos="-11.0%p" - latin:keyWidth="0%p" + latin:keyXPos="-11.00%p" + latin:keyWidth="fillRight" latin:keyEdgeFlags="right" /> </Row> <Row> @@ -62,8 +55,8 @@ latin:keyStyle="num6KeyStyle" /> <Key latin:keyStyle="returnKeyStyle" - latin:keyXPos="-11.0%p" - latin:keyWidth="0%p" + latin:keyXPos="-11.00%p" + latin:keyWidth="fillRight" latin:keyEdgeFlags="right" /> </Row> <Row> @@ -79,17 +72,18 @@ <Row> <Key latin:keyStyle="tabKeyStyle" - latin:keyWidth="11.0%p" + latin:keyWidth="11.00%p" latin:keyEdgeFlags="left" /> <Spacer latin:keyXPos="24.875%p" /> <Key latin:keyStyle="num0KeyStyle" /> - <Spacer + <Spacer /> + <Key + latin:keyStyle="shortcutOrSettingsKeyStyle" latin:keyXPos="-11.00%p" - latin:keyWidth="0dp" /> - <include - latin:keyboardLayout="@xml/kbd_qwerty_f2" /> + latin:keyWidth="fillRight" + latin:keyEdgeFlags="right" /> </Row> </case> <!-- latin:passwordInput="false" --> @@ -98,13 +92,16 @@ <Row> <Key latin:keyLabel="-" - latin:keyXPos="11.0%p" + latin:keyStyle="numLabelStyle" + latin:keyXPos="11.00%p" latin:keyWidth="9.25%p" /> <Key latin:keyLabel="+" + latin:keyStyle="numLabelStyle" latin:keyWidth="9.25%p" /> <Key latin:keyLabel="." + latin:keyStyle="numLabelStyle" latin:keyWidth="9.25%p" /> <Key latin:keyLabel="1" @@ -116,19 +113,22 @@ <Key latin:keyStyle="deleteKeyStyle" latin:keyXPos="-11.00%p" - latin:keyWidth="-11.00%p" + latin:keyWidth="fillBoth" latin:keyEdgeFlags="right" /> </Row> <Row> <Key latin:keyLabel="*" - latin:keyXPos="11.0%p" + latin:keyStyle="numLabelStyle" + latin:keyXPos="11.00%p" latin:keyWidth="9.25%p" /> <Key latin:keyLabel="/" + latin:keyStyle="numLabelStyle" latin:keyWidth="9.25%p" /> <Key latin:keyLabel="," + latin:keyStyle="numLabelStyle" latin:keyWidth="9.25%p" /> <Key latin:keyLabel="4" @@ -140,7 +140,7 @@ <Key latin:keyStyle="returnKeyStyle" latin:keyXPos="-11.00%p" - latin:keyWidth="-11.00%p" + latin:keyWidth="fillBoth" latin:keyEdgeFlags="right" /> </Row> <Row> @@ -149,13 +149,16 @@ edge key. --> <Key latin:keyLabel="(" - latin:keyXPos="11.0%p" + latin:keyStyle="numLabelStyle" + latin:keyXPos="11.00%p" latin:keyWidth="9.25%p" /> <Key latin:keyLabel=")" + latin:keyStyle="numLabelStyle" latin:keyWidth="9.25%p" /> <Key latin:keyLabel="=" + latin:keyStyle="numLabelStyle" latin:keyWidth="9.25%p" /> <Key latin:keyLabel="7" @@ -175,17 +178,18 @@ latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle" latin:keyWidth="27.75%p" /> <Key - latin:keyLabel="*" + latin:keyStyle="numStarKeyStyle" latin:keyXPos="38.75%p" /> <Key latin:keyLabel="0" /> <Key - latin:keyLabel="#" /> - <Spacer + latin:keyLabel="#" + latin:keyStyle="numLabelStyle" /> + <Key + latin:keyStyle="shortcutOrSettingsKeyStyle" latin:keyXPos="-11.00%p" - latin:keyWidth="0dp" /> - <include - latin:keyboardLayout="@xml/kbd_qwerty_f2" /> + latin:keyWidth="fillBoth" + latin:keyEdgeFlags="right" /> </Row> </default> </switch> diff --git a/java/res/xml-sw600dp/kbd_numkey_styles.xml b/java/res/xml-sw600dp/kbd_numkey_styles.xml deleted file mode 100644 index b10dc9333..000000000 --- a/java/res/xml-sw600dp/kbd_numkey_styles.xml +++ /dev/null @@ -1,150 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2011, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> - -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <switch> - <case - latin:colorScheme="white" - > - <key-style - latin:styleName="num0KeyStyle" - latin:code="48" - latin:keyIcon="@drawable/sym_keyboard_num0_holo" /> - <key-style - latin:styleName="num1KeyStyle" - latin:code="49" - latin:keyIcon="@drawable/sym_keyboard_num1_holo" /> - <key-style - latin:styleName="num2KeyStyle" - latin:code="50" - latin:keyIcon="@drawable/sym_keyboard_num2_holo" /> - <key-style - latin:styleName="num3KeyStyle" - latin:code="51" - latin:keyIcon="@drawable/sym_keyboard_num3_holo" /> - <key-style - latin:styleName="num4KeyStyle" - latin:code="52" - latin:keyIcon="@drawable/sym_keyboard_num4_holo" /> - <key-style - latin:styleName="num5KeyStyle" - latin:code="53" - latin:keyIcon="@drawable/sym_keyboard_num5_holo" /> - <key-style - latin:styleName="num6KeyStyle" - latin:code="54" - latin:keyIcon="@drawable/sym_keyboard_num6_holo" /> - <key-style - latin:styleName="num7KeyStyle" - latin:code="55" - latin:keyIcon="@drawable/sym_keyboard_num7_holo" /> - <key-style - latin:styleName="num8KeyStyle" - latin:code="56" - latin:keyIcon="@drawable/sym_keyboard_num8_holo" /> - <key-style - latin:styleName="num9KeyStyle" - latin:code="57" - latin:keyIcon="@drawable/sym_keyboard_num9_holo" /> - <key-style - latin:styleName="numStarKeyStyle" - latin:code="42" - latin:keyIcon="@drawable/sym_keyboard_numbstar_holo" /> - <key-style - latin:styleName="numPoundKeyStyle" - latin:code="35" - latin:keyIcon="@drawable/sym_keyboard_numbpound_holo" /> - <key-style - latin:styleName="numAltKeyStyle" - latin:code="@integer/key_switch_alpha_symbol" - latin:keyIcon="@drawable/sym_keyboard_numalt" - latin:iconPreview="@drawable/sym_keyboard_feedback_numalt" /> - <key-style - latin:styleName="numSpaceKeyStyle" - latin:code="@integer/key_space" - latin:keyIcon="@drawable/sym_keyboard_space" - latin:iconPreview="@drawable/sym_keyboard_feedback_space" /> - </case> - <case - latin:colorScheme="black" - > - <key-style - latin:styleName="num0KeyStyle" - latin:code="48" - latin:keyIcon="@drawable/sym_bkeyboard_num0" /> - <key-style - latin:styleName="num1KeyStyle" - latin:code="49" - latin:keyIcon="@drawable/sym_bkeyboard_num1" /> - <key-style - latin:styleName="num2KeyStyle" - latin:code="50" - latin:keyIcon="@drawable/sym_bkeyboard_num2" /> - <key-style - latin:styleName="num3KeyStyle" - latin:code="51" - latin:keyIcon="@drawable/sym_bkeyboard_num3" /> - <key-style - latin:styleName="num4KeyStyle" - latin:code="52" - latin:keyIcon="@drawable/sym_bkeyboard_num4" /> - <key-style - latin:styleName="num5KeyStyle" - latin:code="53" - latin:keyIcon="@drawable/sym_bkeyboard_num5" /> - <key-style - latin:styleName="num6KeyStyle" - latin:code="54" - latin:keyIcon="@drawable/sym_bkeyboard_num6" /> - <key-style - latin:styleName="num7KeyStyle" - latin:code="55" - latin:keyIcon="@drawable/sym_bkeyboard_num7" /> - <key-style - latin:styleName="num8KeyStyle" - latin:code="56" - latin:keyIcon="@drawable/sym_bkeyboard_num8" /> - <key-style - latin:styleName="num9KeyStyle" - latin:code="57" - latin:keyIcon="@drawable/sym_bkeyboard_num9" /> - <key-style - latin:styleName="numStarKeyStyle" - latin:code="42" - latin:keyIcon="@drawable/sym_bkeyboard_numstar" /> - <key-style - latin:styleName="numPoundKeyStyle" - latin:code="35" - latin:keyIcon="@drawable/sym_bkeyboard_numpound" /> - <key-style - latin:styleName="numAltKeyStyle" - latin:code="@integer/key_switch_alpha_symbol" - latin:keyIcon="@drawable/sym_bkeyboard_numalt" - latin:iconPreview="@drawable/sym_keyboard_feedback_numalt" /> - <key-style - latin:styleName="numSpaceKeyStyle" - latin:code="@integer/key_space" - latin:keyIcon="@drawable/sym_bkeyboard_space" - latin:iconPreview="@drawable/sym_keyboard_feedback_space" /> - </case> - </switch> -</merge> diff --git a/java/res/xml-sw600dp/kbd_phone.xml b/java/res/xml-sw600dp/kbd_phone.xml index 220c4b882..017d00352 100644 --- a/java/res/xml-sw600dp/kbd_phone.xml +++ b/java/res/xml-sw600dp/kbd_phone.xml @@ -20,14 +20,7 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardHeight="@dimen/keyboardHeight" - latin:maxKeyboardHeight="50%p" - latin:rowHeight="25%p" latin:keyWidth="16.75%p" - latin:horizontalGap="@dimen/key_horizontal_gap" - latin:verticalGap="@dimen/key_bottom_gap" - latin:popupKeyboardTemplate="@xml/kbd_popup_template" - latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_key_styles" /> @@ -36,13 +29,13 @@ <!-- This row is intentionally not marked as a top row --> <Row> <Key - latin:code="45" - latin:keyLabel=" - " + latin:keyLabel="-" + latin:keyStyle="numLabelStyle" latin:keyXPos="15.625%p" latin:keyWidth="9.25%p" /> <Key - latin:code="43" - latin:keyLabel=" + " + latin:keyLabel="+" + latin:keyStyle="numLabelStyle" latin:keyWidth="9.25%p" /> <Key latin:keyStyle="num1KeyStyle" @@ -54,18 +47,18 @@ <Key latin:keyStyle="deleteKeyStyle" latin:keyXPos="-11.00%p" - latin:keyWidth="-11.00%p" + latin:keyWidth="fillBoth" latin:keyEdgeFlags="right" /> </Row> <Row> <Key - latin:code="44" - latin:keyLabel=" , " + latin:keyLabel="," + latin:keyStyle="numLabelStyle" latin:keyXPos="15.625%p" latin:keyWidth="9.25%p" /> <Key - latin:code="46" - latin:keyLabel=" . " + latin:keyLabel="." + latin:keyStyle="numLabelStyle" latin:keyWidth="9.25%p" /> <Key latin:keyStyle="num4KeyStyle" @@ -77,24 +70,24 @@ <Key latin:keyStyle="returnKeyStyle" latin:keyXPos="-11.00%p" - latin:keyWidth="-11.00%p" + latin:keyWidth="fillBoth" latin:keyEdgeFlags="right" /> </Row> <Row> <Key latin:keyStyle="moreKeyStyle" - latin:keyWidth="11.00%p" + latin:keyWidth="11.0%p" latin:keyEdgeFlags="left" /> <!-- There is an empty area below 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. --> <Key - latin:code="40" - latin:keyLabel=" ( " + latin:keyLabel="(" + latin:keyStyle="numLabelStyle" latin:keyXPos="15.625%p" latin:keyWidth="9.25%p" /> <Key - latin:code="41" - latin:keyLabel=" ) " + latin:keyLabel=")" + latin:keyStyle="numLabelStyle" latin:keyWidth="9.25%p" /> <Key latin:keyStyle="num7KeyStyle" @@ -120,11 +113,12 @@ <Key latin:keyStyle="num0KeyStyle" /> <Key - latin:keyStyle="numPoundKeyStyle" /> - <Spacer + latin:keyLabel="#" + latin:keyStyle="numLabelStyle" /> + <Key + latin:keyStyle="shortcutOrSettingsKeyStyle" latin:keyXPos="-11.00%p" - latin:keyWidth="0dp" /> - <include - latin:keyboardLayout="@xml/kbd_qwerty_f2" /> + latin:keyWidth="fillBoth" + latin:keyEdgeFlags="right" /> </Row> </Keyboard> diff --git a/java/res/xml-sw600dp/kbd_phone_symbols.xml b/java/res/xml-sw600dp/kbd_phone_symbols.xml index 43c4f6d7f..168e6b114 100644 --- a/java/res/xml-sw600dp/kbd_phone_symbols.xml +++ b/java/res/xml-sw600dp/kbd_phone_symbols.xml @@ -20,14 +20,7 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardHeight="@dimen/keyboardHeight" - latin:maxKeyboardHeight="50%p" - latin:rowHeight="25%p" latin:keyWidth="16.75%p" - latin:horizontalGap="@dimen/key_horizontal_gap" - latin:verticalGap="@dimen/key_bottom_gap" - latin:popupKeyboardTemplate="@xml/kbd_popup_template" - latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_key_styles" /> @@ -36,13 +29,13 @@ <!-- This row is intentionally not marked as a top row --> <Row> <Key - latin:code="45" - latin:keyLabel=" - " - latin:keyXPos="11.0%p" + latin:keyLabel="-" + latin:keyStyle="numLabelStyle" + latin:keyXPos="11.00%p" latin:keyWidth="9.25%p" /> <Key - latin:code="43" - latin:keyLabel=" + " + latin:keyLabel="+" + latin:keyStyle="numLabelStyle" latin:keyWidth="9.25%p" /> <Key latin:code="44" @@ -58,18 +51,18 @@ <Key latin:keyStyle="deleteKeyStyle" latin:keyXPos="-11.00%p" - latin:keyWidth="-11.00%p" + latin:keyWidth="fillBoth" latin:keyEdgeFlags="right" /> </Row> <Row> <Key - latin:code="44" - latin:keyLabel=" , " - latin:keyXPos="11.0%p" + latin:keyLabel="," + latin:keyStyle="numLabelStyle" + latin:keyXPos="11.00%p" latin:keyWidth="9.25%p" /> <Key - latin:code="46" - latin:keyLabel=" . " + latin:keyLabel="." + latin:keyStyle="numLabelStyle" latin:keyWidth="9.25%p" /> <Key latin:code="59" @@ -85,7 +78,7 @@ <Key latin:keyStyle="returnKeyStyle" latin:keyXPos="-11.00%p" - latin:keyWidth="-11.00%p" + latin:keyWidth="fillBoth" latin:keyEdgeFlags="right" /> </Row> <Row> @@ -96,16 +89,16 @@ <!-- There is an empty area below 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. --> <Key - latin:code="40" - latin:keyLabel=" ( " + latin:keyLabel="(" + latin:keyStyle="numLabelStyle" latin:keyWidth="9.25%p" /> <Key - latin:code="41" - latin:keyLabel=" ) " + latin:keyLabel=")" + latin:keyStyle="numLabelStyle" latin:keyWidth="9.25%p" /> <Key - latin:code="78" - latin:keyLabel=" N " + latin:keyLabel="N" + latin:keyStyle="numLabelStyle" latin:keyWidth="9.25%p" /> <Key latin:keyStyle="num7KeyStyle" @@ -130,11 +123,12 @@ <Key latin:keyStyle="num0KeyStyle" /> <Key - latin:keyStyle="numPoundKeyStyle" /> - <Spacer + latin:keyLabel="#" + latin:keyStyle="numLabelStyle" /> + <Key + latin:keyStyle="shortcutOrSettingsKeyStyle" latin:keyXPos="-11.00%p" - latin:keyWidth="0dp" /> - <include - latin:keyboardLayout="@xml/kbd_qwerty_f2" /> + latin:keyWidth="fillBoth" + latin:keyEdgeFlags="right" /> </Row> </Keyboard> diff --git a/java/res/xml-sw600dp/kbd_qwerty.xml b/java/res/xml-sw600dp/kbd_qwerty.xml deleted file mode 100644 index 9541e13fd..000000000 --- a/java/res/xml-sw600dp/kbd_qwerty.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2011, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> - -<Keyboard - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardHeight="@dimen/keyboardHeight" - latin:maxKeyboardHeight="50%p" - latin:rowHeight="25%p" - latin:keyWidth="10%p" - latin:horizontalGap="@dimen/key_horizontal_gap" - latin:verticalGap="@dimen/key_bottom_gap" - latin:popupKeyboardTemplate="@xml/kbd_popup_template" - latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" -> - <include - latin:keyboardLayout="@xml/kbd_qwerty_rows" /> -</Keyboard> diff --git a/java/res/xml-sw600dp/kbd_qwerty_f2.xml b/java/res/xml-sw600dp/kbd_qwerty_f2.xml deleted file mode 100644 index e6c57f8f7..000000000 --- a/java/res/xml-sw600dp/kbd_qwerty_f2.xml +++ /dev/null @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2011, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> - -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <switch> - <case - latin:f2KeyMode="settings" - > - <Key - latin:keyStyle="settingsKeyStyle" - latin:keyWidth="0%p" - latin:keyEdgeFlags="right" /> - </case> - <case - latin:f2KeyMode="shortcutIme" - > - <switch> - <case - latin:voiceKeyEnabled="true" - > - <Key - latin:keyStyle="micKeyStyle" - latin:keyWidth="0%p" - latin:keyEdgeFlags="right" /> - </case> - <!-- voiceKeyEnabled="false" --> - <default> - <Spacer /> - </default> - </switch> - </case> - <case - latin:f2KeyMode="shortcutImeOrSettings" - > - <switch> - <case - latin:voiceKeyEnabled="true" - > - <Key - latin:keyStyle="micKeyStyle" - latin:keyWidth="0%p" - latin:keyEdgeFlags="right" /> - </case> - <!-- voiceKeyEnabled="false" --> - <default> - <Key - latin:keyStyle="settingsKeyStyle" - latin:keyWidth="0%p" - latin:keyEdgeFlags="right" /> - </default> - </switch> - </case> - <!-- f2KeyMode="none" --> - <default> - <Spacer /> - </default> - </switch> -</merge> diff --git a/java/res/xml-sw600dp/kbd_qwerty_row1.xml b/java/res/xml-sw600dp/kbd_qwerty_row1.xml index 1a6ed9728..b781d681e 100644 --- a/java/res/xml-sw600dp/kbd_qwerty_row1.xml +++ b/java/res/xml-sw600dp/kbd_qwerty_row1.xml @@ -59,7 +59,7 @@ <Key latin:keyStyle="deleteKeyStyle" latin:keyXPos="-10.0%p" - latin:keyWidth="-10.0%p" + latin:keyWidth="fillBoth" latin:keyEdgeFlags="right" /> </Row> </merge> diff --git a/java/res/xml-sw600dp/kbd_qwerty_row2.xml b/java/res/xml-sw600dp/kbd_qwerty_row2.xml index 1e6011cde..05b005af1 100644 --- a/java/res/xml-sw600dp/kbd_qwerty_row2.xml +++ b/java/res/xml-sw600dp/kbd_qwerty_row2.xml @@ -53,7 +53,7 @@ <Key latin:keyStyle="returnKeyStyle" latin:keyXPos="-14.6%p" - latin:keyWidth="-14.6%p" + latin:keyWidth="fillBoth" latin:keyEdgeFlags="right" /> </Row> </merge> diff --git a/java/res/xml-sw600dp/kbd_qwerty_row3.xml b/java/res/xml-sw600dp/kbd_qwerty_row3.xml index 4118ee197..0dbc5cf66 100644 --- a/java/res/xml-sw600dp/kbd_qwerty_row3.xml +++ b/java/res/xml-sw600dp/kbd_qwerty_row3.xml @@ -58,15 +58,13 @@ <default> <Key latin:keyLabel="," - latin:manualTemporaryUpperCaseCode="33" - latin:keyHintIcon="@drawable/key_hint_exclamation_holo" - latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_exclamation_large_holo" + latin:keyLabelOption="hasUppercaseLetter" + latin:keyHintLetter="!" latin:popupCharacters="!" /> <Key latin:keyLabel="." - latin:manualTemporaryUpperCaseCode="63" - latin:keyHintIcon="@drawable/key_hint_question_holo" - latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_question_large_holo" + latin:keyLabelOption="hasUppercaseLetter" + latin:keyHintLetter="\?" latin:popupCharacters="\?" /> </default> </switch> diff --git a/java/res/xml-sw600dp/kbd_qwerty_row4.xml b/java/res/xml-sw600dp/kbd_qwerty_row4.xml index 6378ea414..958a7ed8f 100644 --- a/java/res/xml-sw600dp/kbd_qwerty_row4.xml +++ b/java/res/xml-sw600dp/kbd_qwerty_row4.xml @@ -48,9 +48,8 @@ <default> <Key latin:keyLabel="/" - latin:manualTemporaryUpperCaseCode="64" - latin:keyHintIcon="@drawable/key_hint_at_holo" - latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_at_large_holo" + latin:keyLabelOption="hasUppercaseLetter" + latin:keyHintLetter="\@" latin:popupCharacters="\@" /> </default> </switch> @@ -75,18 +74,16 @@ > <Key latin:keyLabel="/" - latin:manualTemporaryUpperCaseCode="58" - latin:keyHintIcon="@drawable/key_hint_colon_holo" - latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_colon_large_holo" + latin:keyLabelOption="hasUppercaseLetter" + latin:keyHintLetter=":" latin:popupCharacters=":" latin:keyWidth="9.750%p" /> </case> <default> <Key latin:keyLabel="\?" - latin:manualTemporaryUpperCaseCode="95" - latin:keyHintIcon="@drawable/key_hint_underline_holo" - latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_underline_large_holo" + latin:keyLabelOption="hasUppercaseLetter" + latin:keyHintLetter="_" latin:popupCharacters="_" latin:keyWidth="9.750%p" /> </default> @@ -102,9 +99,8 @@ <default> <Key latin:keyLabel="!" - latin:manualTemporaryUpperCaseCode="39" - latin:keyHintIcon="@drawable/key_hint_quote_holo" - latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_quote_large_holo" + latin:keyLabelOption="hasUppercaseLetter" + latin:keyHintLetter="\'" latin:popupCharacters="\'" latin:keyWidth="9.750%p" /> </default> @@ -125,18 +121,16 @@ > <Key latin:keyLabel="/" - latin:manualTemporaryUpperCaseCode="58" - latin:keyHintIcon="@drawable/key_hint_colon_holo" - latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_colon_large_holo" + latin:keyLabelOption="hasUppercaseLetter" + latin:keyHintLetter=":" latin:popupCharacters=":" latin:keyWidth="9.750%p" /> </case> <default> <Key latin:keyLabel="\'" - latin:manualTemporaryUpperCaseCode="34" - latin:keyHintIcon="@drawable/key_hint_quote_holo" - latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_quote_large_holo" + latin:keyLabelOption="hasUppercaseLetter" + latin:keyHintLetter=""" latin:popupCharacters=""" latin:keyWidth="9.750%p" /> </default> @@ -152,19 +146,18 @@ <default> <Key latin:keyLabel="-" - latin:manualTemporaryUpperCaseCode="95" - latin:keyHintIcon="@drawable/key_hint_underline_holo" - latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_underline_large_holo" + latin:keyLabelOption="hasUppercaseLetter" + latin:keyHintLetter="_" latin:popupCharacters="_" latin:keyWidth="9.750%p" /> </default> </switch> </default> </switch> - <Spacer - latin:keyXPos="-10.00%p" - latin:keyWidth="0dp" /> - <include - latin:keyboardLayout="@xml/kbd_qwerty_f2" /> + <Key + latin:keyStyle="shortcutOrSettingsKeyStyle" + latin:keyXPos="-10.0%p" + latin:keyWidth="fillBoth" + latin:keyEdgeFlags="right" /> </Row> </merge> diff --git a/java/res/xml-sw600dp/kbd_row3_right.xml b/java/res/xml-sw600dp/kbd_row3_right.xml index 7867e175a..a9c5eb371 100644 --- a/java/res/xml-sw600dp/kbd_row3_right.xml +++ b/java/res/xml-sw600dp/kbd_row3_right.xml @@ -28,7 +28,7 @@ <Key latin:keyLabel="\@" latin:keyXPos="-8.9%p" - latin:keyWidth="-8.9%p" + latin:keyWidth="fillBoth" latin:keyEdgeFlags="right" /> </case> <case @@ -36,12 +36,11 @@ > <Key latin:keyLabel="-" - latin:manualTemporaryUpperCaseCode="95" - latin:keyHintIcon="@drawable/key_hint_underline_holo" - latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_underline_large_holo" + latin:keyLabelOption="hasUppercaseLetter" + latin:keyHintLetter="_" latin:popupCharacters="_" latin:keyXPos="-8.9%p" - latin:keyWidth="-8.9%p" + latin:keyWidth="fillBoth" latin:keyEdgeFlags="right" /> </case> <case @@ -49,19 +48,18 @@ > <Key latin:keyLabel=":" - latin:manualTemporaryUpperCaseCode="43" - latin:keyHintIcon="@drawable/key_hint_plus_holo" - latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_plus_large_holo" + latin:keyLabelOption="hasUppercaseLetter" + latin:keyHintLetter="+" latin:popupCharacters="+" latin:keyXPos="-8.9%p" - latin:keyWidth="-8.9%p" + latin:keyWidth="fillBoth" latin:keyEdgeFlags="right" /> </case> <default> <Key latin:keyStyle="smileyKeyStyle" latin:keyXPos="-8.9%p" - latin:keyWidth="-8.9%p" + latin:keyWidth="fillBoth" latin:keyEdgeFlags="right" /> </default> </switch> diff --git a/java/res/xml-sw600dp/kbd_rows_arabic.xml b/java/res/xml-sw600dp/kbd_rows_arabic.xml new file mode 100644 index 000000000..bc37d5a9f --- /dev/null +++ b/java/res/xml-sw600dp/kbd_rows_arabic.xml @@ -0,0 +1,134 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2011, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<!-- This file for Arabic layout is an alpha version. It allows to enter --> +<!-- some right-to-left text, but it has gone through no study whatsoever, --> +<!-- and needs to be run through UX. --> +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <include + latin:keyboardLayout="@xml/kbd_key_styles" /> + <Row + latin:keyWidth="8.0%p" + > + <Key + latin:keyLabel="ض" + latin:keyEdgeFlags="left" /> + <Key + latin:keyLabel="ص" /> + <Key + latin:keyLabel="ث" /> + <Key + latin:keyLabel="ق" /> + <Key + latin:keyLabel="ف" + latin:popupCharacters="ف,ڤ" /> + <Key + latin:keyLabel="غ" /> + <Key + latin:keyLabel="ع" /> + <Key + latin:keyLabel="ه" + latin:popupCharacters="ه,هـ" /> + <Key + latin:keyLabel="خ" /> + <Key + latin:keyLabel="ح" /> + <Key + latin:keyLabel="ج" + latin:popupCharacters="ج,چ" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyXPos="-10.0%p" + latin:keyWidth="fillBoth" + latin:keyEdgeFlags="right" /> + </Row> + <Row + latin:keyWidth="8.0%p" + > + <Key + latin:keyLabel="ش" + latin:keyXPos="3.0%p" /> + <Key + latin:keyLabel="س" /> + <Key + latin:keyLabel="ي" /> + <Key + latin:keyLabel="ب" + latin:popupCharacters="ب,پ" /> + <Key + latin:keyLabel="ل" + latin:popupCharacters="ل,لا" /> + <Key + latin:keyLabel="ا" + latin:popupCharacters="ا,أ,إ,آ" /> + <Key + latin:keyLabel="ت" /> + <Key + latin:keyLabel="ن" /> + <Key + latin:keyLabel="م" /> + <Key + latin:keyLabel="ك" + latin:popupCharacters="ك,گ" /> + <Key + latin:keyLabel="ط" /> + <Key + latin:keyStyle="returnKeyStyle" + latin:keyXPos="-14.6%p" + latin:keyWidth="fillBoth" + latin:keyEdgeFlags="right" /> + </Row> + <Row + latin:keyWidth="7.65%p" + > + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="8.0%p" + latin:keyEdgeFlags="left" /> + <Key + latin:keyLabel="ئ" /> + <Key + latin:keyLabel="ء" /> + <Key + latin:keyLabel="ؤ" /> + <Key + latin:keyLabel="ر" /> + <Key + latin:keyLabel="ذ" /> + <Key + latin:keyLabel="ى" /> + <Key + latin:keyLabel="ة" /> + <Key + latin:keyLabel="و" /> + <Key + latin:keyLabel="ز" + latin:popupCharacters="ز,ژ" /> + <Key + latin:keyLabel="ظ" /> + <Key + latin:keyLabel="د" /> + <include + latin:keyboardLayout="@xml/kbd_row3_right" /> + </Row> + <include latin:keyboardLayout="@xml/kbd_qwerty_row4" /> +</merge> diff --git a/java/res/xml-sw600dp/kbd_azerty_rows.xml b/java/res/xml-sw600dp/kbd_rows_azerty.xml index e3a835387..b53bbbbf9 100644 --- a/java/res/xml-sw600dp/kbd_azerty_rows.xml +++ b/java/res/xml-sw600dp/kbd_rows_azerty.xml @@ -24,7 +24,7 @@ <include latin:keyboardLayout="@xml/kbd_key_styles" /> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" latin:rowEdgeFlags="top" > <Key @@ -61,15 +61,16 @@ <Key latin:keyStyle="deleteKeyStyle" latin:keyXPos="-10.0%p" - latin:keyWidth="-10.0%p" + latin:keyWidth="fillBoth" latin:keyEdgeFlags="right" /> </Row> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <Key latin:keyLabel="q" latin:popupCharacters="@string/alternates_for_q" + latin:keyXPos="5.0%p" latin:keyEdgeFlags="left" /> <Key latin:keyLabel="s" @@ -97,11 +98,11 @@ <Key latin:keyStyle="returnKeyStyle" latin:keyXPos="-14.6%p" - latin:keyWidth="-14.6%p" + latin:keyWidth="fillBoth" latin:keyEdgeFlags="right" /> </Row> <Row - latin:keyWidth="8.9%p" + latin:keyWidth="8.5%p" > <Key latin:keyStyle="shiftKeyStyle" @@ -137,21 +138,19 @@ <default> <Key latin:keyLabel="," - latin:manualTemporaryUpperCaseCode="33" - latin:keyHintIcon="@drawable/key_hint_exclamation_holo" - latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_exclamation_large_holo" + latin:keyLabelOption="hasUppercaseLetter" + latin:keyHintLetter="!" latin:popupCharacters="!" /> <Key latin:keyLabel="." - latin:manualTemporaryUpperCaseCode="63" - latin:keyHintIcon="@drawable/key_hint_question_holo" - latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_question_large_holo" + latin:keyLabelOption="hasUppercaseLetter" + latin:keyHintLetter="\?" latin:popupCharacters="\?" /> </default> </switch> <include latin:keyboardLayout="@xml/kbd_row3_right" /> - </Row> + </Row> <include latin:keyboardLayout="@xml/kbd_qwerty_row4" /> </merge> diff --git a/java/res/xml-sw600dp/kbd_rows_hebrew.xml b/java/res/xml-sw600dp/kbd_rows_hebrew.xml new file mode 100644 index 000000000..a1475376b --- /dev/null +++ b/java/res/xml-sw600dp/kbd_rows_hebrew.xml @@ -0,0 +1,122 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2011, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <include + latin:keyboardLayout="@xml/kbd_key_styles" /> + <Row + latin:keyWidth="8.600%p" + latin:rowEdgeFlags="top" + > + <Key + latin:keyLabel="," /> + <Key + latin:keyLabel="." /> + <Key + latin:keyLabel="ק" /> + <Key + latin:keyLabel="ר" /> + <Key + latin:keyLabel="א" /> + <Key + latin:keyLabel="ט" /> + <Key + latin:keyLabel="ו" /> + <Key + latin:keyLabel="ן" /> + <Key + latin:keyLabel="ם" /> + <Key + latin:keyLabel="פ" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyXPos="-12.000%p" + latin:keyWidth="fillBoth" + latin:keyEdgeFlags="right" /> + </Row> + <Row + latin:keyWidth="8.600%p" + > + <Key + latin:keyLabel="ש" + latin:keyXPos="4.000%p" /> + <Key + latin:keyLabel="ד" /> + <Key + latin:keyLabel="ג" + latin:popupCharacters="ג,ג׳" /> + <Key + latin:keyLabel="כ" /> + <Key + latin:keyLabel="ע" /> + <Key + latin:keyLabel="י" + latin:popupCharacters="י,ײַ" /> + <Key + latin:keyLabel="ח" + latin:popupCharacters="ח,ח׳" /> + <Key + latin:keyLabel="ל" /> + <Key + latin:keyLabel="ך" /> + <Key + latin:keyLabel="ף" /> + <Key + latin:keyStyle="returnKeyStyle" + latin:keyXPos="-10.400%p" + latin:keyWidth="fillBoth" + latin:keyEdgeFlags="right" /> + </Row> + <Row + latin:keyWidth="8.600%p" + > + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="10.000%p" + latin:keyEdgeFlags="left" /> + <Key + latin:keyLabel="ז" + latin:popupCharacters="ז,ז׳" /> + <Key + latin:keyLabel="ס" /> + <Key + latin:keyLabel="ב" /> + <Key + latin:keyLabel="ה" /> + <Key + latin:keyLabel="נ" /> + <Key + latin:keyLabel="מ" /> + <Key + latin:keyLabel="צ" + latin:popupCharacters="צ,צ׳" /> + <Key + latin:keyLabel="ת" + latin:popupCharacters="ת,ת׳" /> + <Key + latin:keyLabel="ץ" + latin:popupCharacters="ץ,ץ׳" /> + <include + latin:keyboardLayout="@xml/kbd_row3_right" /> + </Row> + <include latin:keyboardLayout="@xml/kbd_qwerty_row4" /> +</merge> diff --git a/java/res/xml-sw600dp/kbd_qwerty_rows.xml b/java/res/xml-sw600dp/kbd_rows_qwerty.xml index a2d26b3de..a2d26b3de 100644 --- a/java/res/xml-sw600dp/kbd_qwerty_rows.xml +++ b/java/res/xml-sw600dp/kbd_rows_qwerty.xml diff --git a/java/res/xml-sw600dp/kbd_qwertz_rows.xml b/java/res/xml-sw600dp/kbd_rows_qwertz.xml index 5c2fbf2b9..7ea9b0f37 100644 --- a/java/res/xml-sw600dp/kbd_qwertz_rows.xml +++ b/java/res/xml-sw600dp/kbd_rows_qwertz.xml @@ -61,7 +61,7 @@ <Key latin:keyStyle="deleteKeyStyle" latin:keyXPos="-10.0%p" - latin:keyWidth="-10.0%p" + latin:keyWidth="fillBoth" latin:keyEdgeFlags="right" /> </Row> <include @@ -103,15 +103,13 @@ <default> <Key latin:keyLabel="," - latin:manualTemporaryUpperCaseCode="33" - latin:keyHintIcon="@drawable/key_hint_exclamation_holo" - latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_exclamation_large_holo" + latin:keyLabelOption="hasUppercaseLetter" + latin:keyHintLetter="!" latin:popupCharacters="!" /> <Key latin:keyLabel="." - latin:manualTemporaryUpperCaseCode="63" - latin:keyHintIcon="@drawable/key_hint_question_holo" - latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_question_large_holo" + latin:keyLabelOption="hasUppercaseLetter" + latin:keyHintLetter="\?" latin:popupCharacters="\?" /> </default> </switch> diff --git a/java/res/xml-sw600dp/kbd_ru_rows.xml b/java/res/xml-sw600dp/kbd_rows_russian.xml index fb820ccc1..43fa665e6 100644 --- a/java/res/xml-sw600dp/kbd_ru_rows.xml +++ b/java/res/xml-sw600dp/kbd_rows_russian.xml @@ -55,7 +55,7 @@ <Key latin:keyStyle="deleteKeyStyle" latin:keyXPos="-10.0%p" - latin:keyWidth="-10.0%p" + latin:keyWidth="fillBoth" latin:keyEdgeFlags="right" /> </Row> <Row @@ -87,7 +87,7 @@ <Key latin:keyStyle="returnKeyStyle" latin:keyXPos="-14.6%p" - latin:keyWidth="-14.6%p" + latin:keyWidth="fillBoth" latin:keyEdgeFlags="right" /> </Row> <Row @@ -118,9 +118,8 @@ latin:keyLabel="ю" /> <Key latin:keyLabel="." - latin:manualTemporaryUpperCaseCode="44" - latin:keyHintIcon="@drawable/key_hint_comma_holo" - latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_comma_large_holo" + latin:keyLabelOption="hasUppercaseLetter" + latin:keyHintLetter="," latin:popupCharacters="," /> <include latin:keyboardLayout="@xml/kbd_row3_right" /> diff --git a/java/res/xml-sw600dp/kbd_qwerty_rows_scandinavia.xml b/java/res/xml-sw600dp/kbd_rows_scandinavian.xml index 59e86c5c8..3666ead51 100644 --- a/java/res/xml-sw600dp/kbd_qwerty_rows_scandinavia.xml +++ b/java/res/xml-sw600dp/kbd_rows_scandinavian.xml @@ -24,13 +24,12 @@ <include latin:keyboardLayout="@xml/kbd_key_styles" /> <Row - latin:keyWidth="8.0%p" + latin:keyWidth="7.9%p" latin:rowEdgeFlags="top" > <Key latin:keyLabel="q" latin:popupCharacters="@string/alternates_for_q" - latin:keyXPos="2.15%p" latin:keyEdgeFlags="left" /> <Key latin:keyLabel="w" @@ -64,14 +63,15 @@ <Key latin:keyStyle="deleteKeyStyle" latin:keyXPos="-10.0%p" - latin:keyWidth="-10.0%p" + latin:keyWidth="fillBoth" latin:keyEdgeFlags="right" /> </Row> <Row - latin:keyWidth="8.0%p" + latin:keyWidth="7.9%p" > <Key latin:keyLabel="a" + latin:keyXPos="3.5%p" latin:popupCharacters="@string/alternates_for_a" latin:keyEdgeFlags="left" /> <Key @@ -104,11 +104,63 @@ <Key latin:keyStyle="returnKeyStyle" latin:keyXPos="-14.6%p" - latin:keyWidth="-14.6%p" + latin:keyWidth="fillBoth" latin:keyEdgeFlags="right" /> </Row> - <include - latin:keyboardLayout="@xml/kbd_qwerty_row3" /> + <Row + latin:keyWidth="7.9%p" + > + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="10.0%p" + latin:keyEdgeFlags="left" /> + <Spacer + latin:keyWidth="4.35%p" /> + <Key + latin:keyLabel="z" + latin:popupCharacters="@string/alternates_for_z" /> + <Key + latin:keyLabel="x" /> + <Key + latin:keyLabel="c" + latin:popupCharacters="@string/alternates_for_c" /> + <Key + latin:keyLabel="v" + latin:popupCharacters="@string/alternates_for_v" /> + <Key + latin:keyLabel="b" /> + <Key + latin:keyLabel="n" + latin:popupCharacters="@string/alternates_for_n" /> + <Key + latin:keyLabel="m" /> + <switch> + <case + latin:mode="email" + > + <Key + latin:keyLabel="," /> + <Key + latin:keyLabel="." /> + </case> + <default> + <Key + latin:keyLabel="," + latin:keyLabelOption="hasUppercaseLetter" + latin:keyHintLetter="!" + latin:popupCharacters="!" /> + <Key + latin:keyLabel="." + latin:keyLabelOption="hasUppercaseLetter" + latin:keyHintLetter="\?" + latin:popupCharacters="\?" /> + </default> + </switch> + <Spacer + latin:keyWidth="4.35%p" /> + <include + latin:keyboardLayout="@xml/kbd_row3_right" /> + </Row> <include latin:keyboardLayout="@xml/kbd_qwerty_row4" /> </merge> diff --git a/java/res/xml-sw600dp/kbd_sr_rows.xml b/java/res/xml-sw600dp/kbd_rows_serbian.xml index 09dc2b719..80debdadb 100644 --- a/java/res/xml-sw600dp/kbd_sr_rows.xml +++ b/java/res/xml-sw600dp/kbd_rows_serbian.xml @@ -54,7 +54,7 @@ <Key latin:keyStyle="deleteKeyStyle" latin:keyXPos="-10.0%p" - latin:keyWidth="-10.0%p" + latin:keyWidth="fillBoth" latin:keyEdgeFlags="right" /> </Row> <Row @@ -86,7 +86,7 @@ <Key latin:keyStyle="returnKeyStyle" latin:keyXPos="-14.6%p" - latin:keyWidth="-14.6%p" + latin:keyWidth="fillBoth" latin:keyEdgeFlags="right" /> </Row> <Row @@ -126,15 +126,13 @@ <default> <Key latin:keyLabel="," - latin:manualTemporaryUpperCaseCode="33" - latin:keyHintIcon="@drawable/key_hint_exclamation_holo" - latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_exclamation_large_holo" + latin:keyLabelOption="hasUppercaseLetter" + latin:keyHintLetter="!" latin:popupCharacters="!" /> <Key latin:keyLabel="." - latin:manualTemporaryUpperCaseCode="63" - latin:keyHintIcon="@drawable/key_hint_question_holo" - latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_question_large_holo" + latin:keyLabelOption="hasUppercaseLetter" + latin:keyHintLetter="\?" latin:popupCharacters="\?" /> </default> </switch> diff --git a/java/res/xml-sw600dp/kbd_rows_spanish.xml b/java/res/xml-sw600dp/kbd_rows_spanish.xml new file mode 100644 index 000000000..7ef44bb53 --- /dev/null +++ b/java/res/xml-sw600dp/kbd_rows_spanish.xml @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2011, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <include + latin:keyboardLayout="@xml/kbd_key_styles" /> + <include + latin:keyboardLayout="@xml/kbd_qwerty_row1" /> + <Row + latin:keyWidth="8.5%p" + > + <Key + latin:keyLabel="a" + latin:popupCharacters="@string/alternates_for_a" + latin:keyXPos="5.0%p" + latin:keyEdgeFlags="left" /> + <Key + latin:keyLabel="s" + latin:popupCharacters="@string/alternates_for_s" /> + <Key + latin:keyLabel="d" + latin:popupCharacters="@string/alternates_for_d" /> + <Key + latin:keyLabel="f" /> + <Key + latin:keyLabel="g" + latin:popupCharacters="@string/alternates_for_g" /> + <Key + latin:keyLabel="h" /> + <Key + latin:keyLabel="j" /> + <Key + latin:keyLabel="k" + latin:popupCharacters="@string/alternates_for_k" /> + <Key + latin:keyLabel="l" + latin:popupCharacters="@string/alternates_for_l" /> + <Key + latin:keyLabel="ñ" /> + <Key + latin:keyStyle="returnKeyStyle" + latin:keyXPos="-14.6%p" + latin:keyWidth="fillBoth" + latin:keyEdgeFlags="right" /> + </Row> + <include + latin:keyboardLayout="@xml/kbd_qwerty_row3" /> + <include + latin:keyboardLayout="@xml/kbd_qwerty_row4" /> +</merge> diff --git a/java/res/xml-sw600dp/kbd_symbols.xml b/java/res/xml-sw600dp/kbd_symbols.xml index 3f555aa85..fca97c737 100644 --- a/java/res/xml-sw600dp/kbd_symbols.xml +++ b/java/res/xml-sw600dp/kbd_symbols.xml @@ -20,13 +20,6 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardHeight="@dimen/keyboardHeight" - latin:maxKeyboardHeight="50%p" - latin:rowHeight="25%p" - latin:horizontalGap="@dimen/key_horizontal_gap" - latin:verticalGap="@dimen/key_bottom_gap" - latin:popupKeyboardTemplate="@xml/kbd_popup_template" - latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_key_styles" /> @@ -66,7 +59,7 @@ <Key latin:keyStyle="deleteKeyStyle" latin:keyXPos="-10.0%p" - latin:keyWidth="-10.0%p" + latin:keyWidth="fillBoth" latin:keyEdgeFlags="right" /> </Row> <Row @@ -100,7 +93,7 @@ <Key latin:keyStyle="returnKeyStyle" latin:keyXPos="-14.6%p" - latin:keyWidth="-14.6%p" + latin:keyWidth="fillBoth" latin:keyEdgeFlags="right" /> </Row> <Row @@ -173,7 +166,7 @@ </switch> <Key latin:keyLabel="/" - latin:keyWidth="0%p" /> + latin:keyWidth="fillRight" /> </Row> <!-- This row is intentionally not marked as a bottom row --> <Row @@ -216,10 +209,10 @@ latin:keyWidth="9.750%p" /> </default> </switch> - <Spacer - latin:keyXPos="-10.00%p" - latin:keyWidth="0dp" /> - <include - latin:keyboardLayout="@xml/kbd_qwerty_f2" /> + <Key + latin:keyStyle="shortcutOrSettingsKeyStyle" + latin:keyXPos="-10.0%p" + latin:keyWidth="fillBoth" + latin:keyEdgeFlags="right" /> </Row> </Keyboard> diff --git a/java/res/xml-sw600dp/kbd_symbols_shift.xml b/java/res/xml-sw600dp/kbd_symbols_shift.xml index 7ad7afc17..c23681d4e 100644 --- a/java/res/xml-sw600dp/kbd_symbols_shift.xml +++ b/java/res/xml-sw600dp/kbd_symbols_shift.xml @@ -20,13 +20,6 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyboardHeight="@dimen/keyboardHeight" - latin:maxKeyboardHeight="50%p" - latin:rowHeight="25%p" - latin:horizontalGap="@dimen/key_horizontal_gap" - latin:verticalGap="@dimen/key_bottom_gap" - latin:popupKeyboardTemplate="@xml/kbd_popup_template" - latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_key_styles" /> @@ -67,7 +60,7 @@ <Key latin:keyStyle="deleteKeyStyle" latin:keyXPos="-10.0%p" - latin:keyWidth="-10.0%p" + latin:keyWidth="fillBoth" latin:keyEdgeFlags="right" /> </Row> <Row @@ -104,7 +97,7 @@ <Key latin:keyStyle="returnKeyStyle" latin:keyXPos="-14.6%p" - latin:keyWidth="-14.6%p" + latin:keyWidth="fillBoth" latin:keyEdgeFlags="right" /> </Row> <Row @@ -154,10 +147,10 @@ latin:keyStyle="spaceKeyStyle" latin:keyXPos="30.750%p" latin:keyWidth="39.750%p" /> - <Spacer - latin:keyXPos="-10.00%p" - latin:keyWidth="0dp" /> - <include - latin:keyboardLayout="@xml/kbd_qwerty_f2" /> + <Key + latin:keyStyle="shortcutOrSettingsKeyStyle" + latin:keyXPos="-10.0%p" + latin:keyWidth="fillRight" + latin:keyEdgeFlags="right" /> </Row> </Keyboard> |