nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Introduce new 7" keyboard layout (DO NOT MERGE) 

This change only changes QWERTY layout.  The phone/number and
AZERTY/QWERTZ/Russian/Scandinavia layouts will be fixed soon.

Bug: 4442045
Change-Id: Ib42c84e1d05fee513b1b7680ef0dcf755298d444
main
Tadashi G. Takaoka 2011-05-26 12:50:38 +09:00
parent f5d9649680
commit d8638ff34b
11 changed files with 577 additions and 350 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/res/values-sw600dp-land/dimens.xml
View File

@ -31,8 +31,8 @@
<!-- key_height x 1.0 --> <!-- key_height x 1.0 -->
<dimen name="key_preview_height">13.0mm</dimen> <dimen name="key_preview_height">13.0mm</dimen>
<dimen name="key_letter_size">28dip</dimen> <dimen name="key_letter_size">25dip</dimen>
<dimen name="key_label_text_size">20dip</dimen> <dimen name="key_label_text_size">18dip</dimen>
<!-- left or right padding of label alignment --> <!-- left or right padding of label alignment -->
<dimen name="key_label_horizontal_alignment_padding">18dip</dimen> <dimen name="key_label_horizontal_alignment_padding">18dip</dimen>
<dimen name="candidate_strip_padding">40.0mm</dimen> <dimen name="candidate_strip_padding">40.0mm</dimen>

1
java/res/values-sw600dp/config.xml
View File

@ -21,6 +21,7 @@
<resources> <resources>
<bool name="config_enable_show_settings_key_option">true</bool> <bool name="config_enable_show_settings_key_option">true</bool>
<bool name="config_enable_show_subtype_settings">false</bool> <bool name="config_enable_show_subtype_settings">false</bool>
<!-- TODO: Set this false after layout debug -->
<bool name="config_enable_show_voice_key_option">true</bool> <bool name="config_enable_show_voice_key_option">true</bool>
<bool name="config_enable_show_popup_on_keypress_option">false</bool> <bool name="config_enable_show_popup_on_keypress_option">false</bool>
<bool name="config_enable_show_recorrection_option">false</bool> <bool name="config_enable_show_recorrection_option">false</bool>

4
java/res/values-sw600dp/dimens.xml
View File

@ -37,8 +37,8 @@
<!-- popup_key_height x -1.0 --> <!-- popup_key_height x -1.0 -->
<dimen name="mini_keyboard_vertical_correction">-13.0mm</dimen> <dimen name="mini_keyboard_vertical_correction">-13.0mm</dimen>
<dimen name="key_letter_size">26dip</dimen> <dimen name="key_letter_size">24dip</dimen>
<dimen name="key_label_text_size">16dip</dimen> <dimen name="key_label_text_size">14dip</dimen>
<dimen name="key_preview_text_size_large">24dip</dimen> <dimen name="key_preview_text_size_large">24dip</dimen>
<!-- left or right padding of label alignment --> <!-- left or right padding of label alignment -->
<dimen name="key_label_horizontal_alignment_padding">6dip</dimen> <dimen name="key_label_horizontal_alignment_padding">6dip</dimen>

264
java/res/xml-sw600dp/kbd_key_styles.xml
View File

@ -45,7 +45,15 @@
<key-style <key-style
latin:styleName="settingsPopupStyle" latin:styleName="settingsPopupStyle"
latin:parentStyle="functionalKeyStyle" /> latin:parentStyle="functionalKeyStyle" />
</case> <key-style
latin:styleName="webTabKeyStyle"
latin:code="@integer/key_tab"
latin:keyIcon="@drawable/sym_keyboard_tab_holo"
latin:iconPreview="@drawable/sym_keyboard_tab_holo"
latin:keyHintIcon="@drawable/hint_popup_holo"
latin:popupCharacters="\@drawable/sym_keyboard_settings|\@integer/key_settings"
latin:parentStyle="functionalKeyStyle" />
</case>
<!-- latin:hasSettingsKey="false" --> <!-- latin:hasSettingsKey="false" -->
<default> <default>
<key-style <key-style
@ -53,6 +61,12 @@
latin:keyHintIcon="@drawable/hint_popup_holo" latin:keyHintIcon="@drawable/hint_popup_holo"
latin:popupCharacters="\@drawable/sym_keyboard_settings|\@integer/key_settings" latin:popupCharacters="\@drawable/sym_keyboard_settings|\@integer/key_settings"
latin:parentStyle="functionalKeyStyle" /> latin:parentStyle="functionalKeyStyle" />
<key-style
latin:styleName="webTabKeyStyle"
latin:code="@integer/key_tab"
latin:keyIcon="@drawable/sym_keyboard_tab_holo"
latin:iconPreview="@drawable/sym_keyboard_tab_holo"
latin:parentStyle="functionalKeyStyle" />
</default> </default>
</switch> </switch>
<!-- Functional key styles --> <!-- Functional key styles -->
@ -75,60 +89,39 @@
latin:iconPreview="@drawable/sym_keyboard_feedback_delete" latin:iconPreview="@drawable/sym_keyboard_feedback_delete"
latin:parentStyle="functionalKeyStyle" latin:parentStyle="functionalKeyStyle"
latin:isRepeatable="true" /> latin:isRepeatable="true" />
<switch> <key-style
<!-- When this qwerty keyboard has no voice key but voice key is enabled, then latin:styleName="returnKeyStyle"
symbol keyboard will have mic key. That means we should use "?123mic" key latin:code="@integer/key_return"
here. --> latin:keyIcon="@drawable/sym_keyboard_return_holo"
<case latin:iconPreview="@drawable/sym_keyboard_feedback_return"
latin:voiceKeyEnabled="true" latin:parentStyle="functionalKeyStyle" />
latin:hasVoiceKey="false" <key-style
> latin:styleName="spaceKeyStyle"
<key-style latin:code="@integer/key_space"
latin:styleName="toSymbolKeyStyle" latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
latin:code="@integer/key_switch_alpha_symbol" <key-style
latin:keyIcon="@drawable/sym_keyboard_123_mic" latin:styleName="nonSpecialBackgroundSpaceKeyStyle"
latin:iconPreview="@drawable/sym_keyboard_feedback_123_mic" latin:code="@integer/key_space"
latin:parentStyle="functionalKeyStyle" /> latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
</case> <key-style
<default> latin:styleName="smileyKeyStyle"
<key-style latin:keyLabel=":-)"
latin:styleName="toSymbolKeyStyle" latin:keyOutputText=":-) "
latin:code="@integer/key_switch_alpha_symbol" latin:keyHintIcon="@drawable/hint_popup_holo"
latin:keyLabel="@string/label_to_symbol_key" latin:popupCharacters="@string/alternates_for_smiley"
latin:parentStyle="functionalKeyStyle" /> latin:maxPopupKeyboardColumn="5" />
</default>
</switch>
<key-style <key-style
latin:styleName="settingsKeyStyle" latin:styleName="settingsKeyStyle"
latin:code="@integer/key_settings" latin:code="@integer/key_settings"
latin:keyIcon="@drawable/sym_keyboard_settings_holo" latin:keyIcon="@drawable/sym_keyboard_settings_holo"
latin:iconPreview="@drawable/sym_keyboard_feedback_settings" latin:iconPreview="@drawable/sym_keyboard_feedback_settings"
latin:parentStyle="functionalKeyStyle" /> latin:parentStyle="functionalKeyStyle" />
<key-style
latin:styleName="spaceKeyStyle"
latin:code="@integer/key_space"
latin:keyIcon="@drawable/sym_keyboard_space_holo"
latin:iconPreview="@drawable/sym_keyboard_feedback_space"
latin:parentStyle="functionalKeyStyle" />
<key-style
latin:styleName="tabKeyStyle"
latin:code="@integer/key_tab"
latin:keyIcon="@drawable/sym_keyboard_tab"
latin:iconPreview="@drawable/sym_keyboard_feedback_tab"
latin:parentStyle="functionalKeyStyle" />
<key-style <key-style
latin:styleName="micKeyStyle" latin:styleName="micKeyStyle"
latin:code="@integer/key_voice" latin:code="@integer/key_voice"
latin:keyIcon="@drawable/sym_keyboard_voice_holo" latin:keyIcon="@drawable/sym_keyboard_voice_holo"
latin:iconPreview="@drawable/sym_keyboard_voice_holo" latin:iconPreview="@drawable/sym_keyboard_feedback_mic"
latin:parentStyle="settingsPopupStyle" /> latin:parentStyle="settingsPopupStyle" />
<!-- Note: This key style is not for functional tab key. This is used for the tab key
which is laid out as normal letter key. -->
<key-style
latin:styleName="nonSpecialBackgroundTabKeyStyle"
latin:code="@integer/key_tab"
latin:keyIcon="@drawable/sym_keyboard_tab"
latin:iconPreview="@drawable/sym_keyboard_feedback_tab" />
</case> </case>
<case <case
latin:colorScheme="black" latin:colorScheme="black"
@ -148,170 +141,67 @@
latin:iconPreview="@drawable/sym_keyboard_feedback_delete" latin:iconPreview="@drawable/sym_keyboard_feedback_delete"
latin:parentStyle="functionalKeyStyle" latin:parentStyle="functionalKeyStyle"
latin:isRepeatable="true" /> latin:isRepeatable="true" />
<switch> <key-style
<!-- When this qwerty keyboard has no voice key but voice key is enabled, then latin:styleName="returnKeyStyle"
symbol keyboard will have mic key. That means we should use "?123mic" key latin:code="@integer/key_return"
here. --> latin:keyIcon="@drawable/sym_bkeyboard_return"
<case latin:iconPreview="@drawable/sym_keyboard_feedback_return"
latin:voiceKeyEnabled="true" latin:parentStyle="functionalKeyStyle" />
latin:hasVoiceKey="false" <key-style
> latin:styleName="spaceKeyStyle"
<key-style latin:code="@integer/key_space"
latin:styleName="toSymbolKeyStyle" latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
latin:code="@integer/key_switch_alpha_symbol" <key-style
latin:keyIcon="@drawable/sym_bkeyboard_123_mic" latin:styleName="nonSpecialBackgroundSpaceKeyStyle"
latin:iconPreview="@drawable/sym_keyboard_feedback_123_mic" latin:code="@integer/key_space"
latin:parentStyle="functionalKeyStyle" /> latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
</case> <key-style
<default> latin:styleName="smileyKeyStyle"
<key-style latin:keyLabel=":-)"
latin:styleName="toSymbolKeyStyle" latin:keyOutputText=":-) "
latin:code="@integer/key_switch_alpha_symbol" latin:keyHintIcon="@drawable/hint_popup_holo"
latin:keyLabel="@string/label_to_symbol_key" latin:popupCharacters="@string/alternates_for_smiley"
latin:parentStyle="functionalKeyStyle" /> latin:maxPopupKeyboardColumn="5" />
</default>
</switch>
<key-style <key-style
latin:styleName="settingsKeyStyle" latin:styleName="settingsKeyStyle"
latin:code="@integer/key_settings" latin:code="@integer/key_settings"
latin:keyIcon="@drawable/sym_bkeyboard_settings" latin:keyIcon="@drawable/sym_bkeyboard_settings"
latin:iconPreview="@drawable/sym_keyboard_feedback_settings" latin:iconPreview="@drawable/sym_keyboard_feedback_settings"
latin:parentStyle="functionalKeyStyle" /> latin:parentStyle="functionalKeyStyle" />
<key-style
latin:styleName="spaceKeyStyle"
latin:code="@integer/key_space"
latin:keyIcon="@drawable/sym_bkeyboard_space"
latin:iconPreview="@drawable/sym_keyboard_feedback_space"
latin:parentStyle="functionalKeyStyle" />
<key-style
latin:styleName="tabKeyStyle"
latin:code="@integer/key_tab"
latin:keyIcon="@drawable/sym_bkeyboard_tab"
latin:iconPreview="@drawable/sym_keyboard_feedback_tab"
latin:parentStyle="functionalKeyStyle" />
<key-style <key-style
latin:styleName="micKeyStyle" latin:styleName="micKeyStyle"
latin:code="@integer/key_voice" latin:code="@integer/key_voice"
latin:keyIcon="@drawable/sym_bkeyboard_mic" latin:keyIcon="@drawable/sym_bkeyboard_mic"
latin:iconPreview="@drawable/sym_keyboard_feedback_mic" latin:iconPreview="@drawable/sym_keyboard_feedback_mic"
latin:parentStyle="settingsPopupStyle" /> latin:parentStyle="settingsPopupStyle" />
<!-- Note: This key style is not for functional tab key. This is used for the tab key
which is laid out as normal letter key. -->
<key-style
latin:styleName="nonSpecialBackgroundTabKeyStyle"
latin:code="@integer/key_tab"
latin:keyIcon="@drawable/sym_bkeyboard_tab"
latin:iconPreview="@drawable/sym_keyboard_feedback_tab" />
</case> </case>
</switch> </switch>
<!-- Return key style --> <key-style
<switch> latin:styleName="toSymbolKeyStyle"
<case latin:code="@integer/key_switch_alpha_symbol"
latin:imeAction="actionGo" latin:keyLabel="@string/label_to_symbol_key"
> latin:keyLabelOption="fontNormal"
<key-style latin:parentStyle="functionalKeyStyle" />
latin:styleName="returnKeyStyle"
latin:code="@integer/key_return"
latin:keyLabel="@string/label_go_key"
latin:parentStyle="functionalKeyStyle" />
</case>
<case
latin:imeAction="actionNext"
>
<key-style
latin:styleName="returnKeyStyle"
latin:code="@integer/key_return"
latin:keyLabel="@string/label_next_key"
latin:parentStyle="functionalKeyStyle" />
</case>
<case
latin:imeAction="actionDone"
>
<key-style
latin:styleName="returnKeyStyle"
latin:code="@integer/key_return"
latin:keyLabel="@string/label_done_key"
latin:parentStyle="functionalKeyStyle" />
</case>
<case
latin:imeAction="actionSend"
>
<key-style
latin:styleName="returnKeyStyle"
latin:code="@integer/key_return"
latin:keyLabel="@string/label_send_key"
latin:parentStyle="functionalKeyStyle" />
</case>
<case
latin:imeAction="actionSearch"
>
<switch>
<case
latin:colorScheme="white"
>
<key-style
latin:styleName="returnKeyStyle"
latin:code="@integer/key_return"
latin:keyIcon="@drawable/sym_keyboard_search"
latin:iconPreview="@drawable/sym_keyboard_feedback_search"
latin:parentStyle="functionalKeyStyle" />
</case>
<case
latin:colorScheme="black"
>
<key-style
latin:styleName="returnKeyStyle"
latin:code="@integer/key_return"
latin:keyIcon="@drawable/sym_bkeyboard_search"
latin:iconPreview="@drawable/sym_keyboard_feedback_search"
latin:parentStyle="functionalKeyStyle" />
</case>
</switch>
</case>
<default>
<switch>
<case
latin:colorScheme="white"
>
<key-style
latin:styleName="returnKeyStyle"
latin:code="@integer/key_return"
latin:keyIcon="@drawable/sym_keyboard_return"
latin:iconPreview="@drawable/sym_keyboard_feedback_return"
latin:parentStyle="functionalKeyStyle" />
</case>
<case
latin:colorScheme="black"
>
<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" />
</case>
</switch>
</default>
</switch>
<key-style <key-style
latin:styleName="toAlphaKeyStyle" latin:styleName="toAlphaKeyStyle"
latin:code="@integer/key_switch_alpha_symbol" latin:code="@integer/key_switch_alpha_symbol"
latin:keyLabel="@string/label_to_alpha_key" latin:keyLabel="@string/label_to_alpha_key"
latin:keyLabelOption="fontNormal"
latin:parentStyle="functionalKeyStyle" /> latin:parentStyle="functionalKeyStyle" />
<key-style <key-style
latin:styleName="altKeyStyle" latin:styleName="moreKeyStyle"
latin:code="@integer/key_shift" latin:code="@integer/key_shift"
latin:keyLabel="@string/label_alt_key" latin:keyLabel="@string/label_more_key"
latin:keyLabelOption="fontNormal"
latin:parentStyle="functionalKeyStyle" latin:parentStyle="functionalKeyStyle"
latin:isSticky="true" /> latin:isSticky="true" />
<key-style <key-style
latin:styleName="smileyKeyStyle" latin:styleName="comKeyStyle"
latin:keyLabel=":-)" latin:keyLabel="@string/keylabel_for_popular_domain"
latin:keyOutputText=":-) " latin:keyLabelOption="fontNormal"
latin:keyOutputText="@string/keylabel_for_popular_domain"
latin:keyHintIcon="@drawable/hint_popup_holo" latin:keyHintIcon="@drawable/hint_popup_holo"
latin:popupCharacters="@string/alternates_for_smiley" latin:popupCharacters="@string/alternates_for_popular_domain" />
latin:maxPopupKeyboardColumn="5"
latin:parentStyle="functionalKeyStyle" />
<switch> <switch>
<case <case
latin:passwordInput="true" latin:passwordInput="true"
@ -319,20 +209,12 @@
<key-style <key-style
latin:styleName="nonPasswordSymbolKeyStyle" latin:styleName="nonPasswordSymbolKeyStyle"
latin:enabled="false" /> latin:enabled="false" />
<key-style
latin:styleName="nonPasswordFunctionalKeyStyle"
latin:enabled="false"
latin:parentStyle="functionalKeyStyle" />
</case> </case>
<!-- latin:passwordInput="false" --> <!-- latin:passwordInput="false" -->
<default> <default>
<key-style <key-style
latin:styleName="nonPasswordSymbolKeyStyle" latin:styleName="nonPasswordSymbolKeyStyle"
latin:enabled="true" /> latin:enabled="true" />
<key-style
latin:styleName="nonPasswordFunctionalKeyStyle"
latin:enabled="true"
latin:parentStyle="functionalKeyStyle" />
</default> </default>
</switch> </switch>
</merge> </merge>

7
java/res/xml-sw600dp/kbd_qwerty_row1.xml
View File

@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
> >
<Row <Row
latin:keyWidth="10%p" latin:keyWidth="9.1%p"
latin:rowEdgeFlags="top" latin:rowEdgeFlags="top"
> >
<Key <Key
@ -65,7 +65,10 @@
<Key <Key
latin:keyLabel="p" latin:keyLabel="p"
latin:keyHintIcon="@drawable/key_hint_num0_holo" latin:keyHintIcon="@drawable/key_hint_num0_holo"
latin:popupCharacters="@string/alternates_for_p" latin:popupCharacters="@string/alternates_for_p" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="9.2%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
</merge> </merge>

9
java/res/xml-sw600dp/kbd_qwerty_row2.xml
View File

@ -22,10 +22,10 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
> >
<Row <Row
latin:keyWidth="10%p" latin:keyWidth="9.0%p"
> >
<Spacer <Spacer
latin:horizontalGap="5%p" /> latin:horizontalGap="4.5%p" />
<Key <Key
latin:keyLabel="a" latin:keyLabel="a"
latin:popupCharacters="@string/alternates_for_a" latin:popupCharacters="@string/alternates_for_a"
@ -50,7 +50,10 @@
latin:popupCharacters="@string/alternates_for_k" /> latin:popupCharacters="@string/alternates_for_k" />
<Key <Key
latin:keyLabel="l" latin:keyLabel="l"
latin:popupCharacters="@string/alternates_for_l" latin:popupCharacters="@string/alternates_for_l" />
<Key
latin:keyStyle="returnKeyStyle"
latin:keyWidth="14.6%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
</merge> </merge>

32
java/res/xml-sw600dp/kbd_qwerty_row3.xml
View File

@ -22,11 +22,11 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
> >
<Row <Row
latin:keyWidth="10%p" latin:keyWidth="8.9%p"
> >
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyWidth="15%p" latin:keyWidth="10.0%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:keyLabel="z" latin:keyLabel="z"
@ -46,9 +46,33 @@
latin:popupCharacters="@string/alternates_for_n" /> latin:popupCharacters="@string/alternates_for_n" />
<Key <Key
latin:keyLabel="m" /> latin:keyLabel="m" />
<switch>
<case
latin:mode="email"
>
<Key
latin:keyLabel="," />
<Key
latin:keyLabel="." />
</case>
<default>
<Key
latin:keyLabel=","
latin:manualTemporaryUpperCaseCode="33"
latin:keyHintIcon="@drawable/key_hint_exclamation_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_exclamation_large_holo"
latin:popupCharacters="!" />
<Key
latin:keyLabel="."
latin:manualTemporaryUpperCaseCode="63"
latin:keyHintIcon="@drawable/key_hint_question_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_question_large_holo"
latin:popupCharacters="\?" />
</default>
</switch>
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyWidth="15%p" latin:keyWidth="10.1%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
</merge> </merge>

268
java/res/xml-sw600dp/kbd_qwerty_row4.xml
View File

@ -21,117 +21,225 @@
<merge <merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
> >
<!-- This row is intentionally not marked as a bottom row -->
<Row <Row
latin:keyWidth="10%p" latin:keyWidth="8.9%p"
latin:rowEdgeFlags="bottom"
> >
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyLabelOption="alignLeft"
latin:keyWidth="13.0%p"
latin:keyEdgeFlags="left" />
<switch> <switch>
<case <case
latin:hasSettingsKey="false" latin:languageCode="ru"
> >
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyWidth="20%p"
latin:keyEdgeFlags="left" />
<include
latin:keyboardLayout="@xml/kbd_qwerty_f1" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="40%p" />
<switch> <switch>
<!-- TODO: implement logical OR for <case> attribute -->
<case <case
latin:mode="web" latin:mode="email"
> >
<Key <Key
latin:keyHintIcon="@drawable/hint_popup_holo" latin:keyStyle="comKeyStyle" />
latin:popupCharacters="@string/alternates_for_web_tab_punctuation" </case>
latin:maxPopupKeyboardColumn="8" <case
latin:keyStyle="tabKeyStyle" /> latin:mode="url"
>
<Key
latin:keyStyle="comKeyStyle" />
</case>
<case
latin:imeAction="actionSearch"
>
<Key
latin:keyLabel=":"
latin:manualTemporaryUpperCaseCode="43"
latin:keyHintIcon="@drawable/key_hint_plus_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_plus_large_holo"
latin:popupCharacters="+" />
</case> </case>
<default> <default>
<Key <Key
latin:keyLabel="." latin:keyStyle="smileyKeyStyle" />
latin:keyHintIcon="@drawable/hint_popup_holo"
latin:popupCharacters="@string/alternates_for_punctuation"
latin:maxPopupKeyboardColumn="7"
latin:keyStyle="functionalKeyStyle" />
</default> </default>
</switch> </switch>
<switch> <switch>
<case <case
latin:mode="im" latin:mode="email"
> >
<Key <Key
latin:keyStyle="smileyKeyStyle" latin:keyLabel="\@" />
latin:keyWidth="20%p" </case>
latin:keyEdgeFlags="right" /> <case
latin:mode="url"
>
<Key
latin:keyLabel="-"
latin:manualTemporaryUpperCaseCode="95"
latin:keyHintIcon="@drawable/key_hint_underline_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_underline_large_holo"
latin:popupCharacters="_" />
</case> </case>
<default> <default>
<Key <Key
latin:keyStyle="returnKeyStyle" latin:keyLabel="/"
latin:keyWidth="20%p" latin:manualTemporaryUpperCaseCode="64"
latin:keyEdgeFlags="right" /> latin:keyHintIcon="@drawable/key_hint_at_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_at_large_holo"
latin:popupCharacters="\@" />
</default> </default>
</switch> </switch>
</case> </case>
<case <!-- not languageCode="ru" -->
latin:hasSettingsKey="true" <default>
>
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyWidth="15%p"
latin:keyEdgeFlags="left" />
<Key
latin:keyStyle="settingsKeyStyle" />
<include
latin:keyboardLayout="@xml/kbd_qwerty_f1" />
<switch> <switch>
<case <case
latin:mode="web" latin:mode="url"
> >
<Key <Key
latin:keyStyle="spaceKeyStyle" latin:keyStyle="comKeyStyle"
latin:keyWidth="30%p" /> latin:keyWidth="17.8%p" />
<Key
latin:keyStyle="tabKeyStyle" />
</case> </case>
<default> <default>
<Key <switch>
latin:keyStyle="spaceKeyStyle" <case
latin:keyWidth="30%p" /> latin:mode="email"
>
<Key
latin:keyStyle="comKeyStyle" />
</case>
<case
latin:imeAction="actionSearch"
>
<Key
latin:keyLabel=":"
latin:manualTemporaryUpperCaseCode="43"
latin:keyHintIcon="@drawable/key_hint_plus_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_plus_large_holo"
latin:popupCharacters="+" />
</case>
<default>
<Key
latin:keyStyle="smileyKeyStyle" />
</default>
</switch>
<switch>
<case
latin:mode="email"
>
<Key
latin:keyLabel="\@" />
</case>
<default>
<Key
latin:keyLabel="/"
latin:manualTemporaryUpperCaseCode="64"
latin:keyHintIcon="@drawable/key_hint_at_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_at_large_holo"
latin:popupCharacters="\@" />
</default>
</switch>
</default> </default>
</switch> </switch>
<Key </default>
latin:keyLabel="."
latin:keyHintIcon="@drawable/hint_popup_holo"
latin:popupCharacters="@string/alternates_for_punctuation"
latin:maxPopupKeyboardColumn="7"
latin:keyStyle="functionalKeyStyle" />
<switch>
<case
latin:mode="im"
>
<Key
latin:keyStyle="smileyKeyStyle"
latin:keyWidth="25%p"
latin:keyEdgeFlags="right" />
</case>
<case
latin:mode="web"
>
<Key
latin:keyStyle="returnKeyStyle"
latin:keyWidth="15%p"
latin:keyEdgeFlags="right" />
</case>
<default>
<Key
latin:keyStyle="returnKeyStyle"
latin:keyWidth="25%p"
latin:keyEdgeFlags="right" />
</default>
</switch>
</case>
</switch> </switch>
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="38.5%p" />
<switch>
<case
latin:languageCode="ru"
>
<switch>
<case
latin:mode="email"
>
<Key
latin:keyLabel="-" />
</case>
<case
latin:mode="url"
>
<Key
latin:keyLabel="/"
latin:manualTemporaryUpperCaseCode="58"
latin:keyHintIcon="@drawable/key_hint_colon_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_colon_large_holo"
latin:popupCharacters=":" />
</case>
<default>
<Key
latin:keyLabel="\?"
latin:manualTemporaryUpperCaseCode="95"
latin:keyHintIcon="@drawable/key_hint_underline_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_underline_large_holo"
latin:popupCharacters="_" />
</default>
</switch>
<switch>
<case
latin:mode="email"
>
<Key
latin:keyLabel="_" />
</case>
<default>
<Key
latin:keyLabel="!"
latin:manualTemporaryUpperCaseCode="39"
latin:keyHintIcon="@drawable/key_hint_quote_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_quote_large_holo"
latin:popupCharacters="\'" />
</default>
</switch>
</case>
<!-- not languageCode="ru" -->
<default>
<switch>
<case
latin:mode="email"
>
<Key
latin:keyLabel="-" />
</case>
<case
latin:mode="url"
>
<Key
latin:keyLabel="/"
latin:manualTemporaryUpperCaseCode="58"
latin:keyHintIcon="@drawable/key_hint_colon_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_colon_large_holo"
latin:popupCharacters=":" />
</case>
<default>
<Key
latin:keyLabel="\'"
latin:manualTemporaryUpperCaseCode="34"
latin:keyHintIcon="@drawable/key_hint_quote_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_quote_large_holo"
latin:popupCharacters="&quot;" />
</default>
</switch>
<switch>
<case
latin:mode="email"
>
<Key
latin:keyLabel="_" />
</case>
<default>
<Key
latin:keyLabel="-"
latin:manualTemporaryUpperCaseCode="95"
latin:keyHintIcon="@drawable/key_hint_underline_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_underline_large_holo"
latin:popupCharacters="_" />
</default>
</switch>
</default>
</switch>
<include
latin:keyboardLayout="@xml/kbd_settings" />
</Row> </Row>
</merge> </merge>

86
java/res/xml-sw600dp/kbd_settings.xml Normal file
View File

@ -0,0 +1,86 @@
<?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:mode="web"
>
<switch>
<case
latin:voiceKeyEnabled="true"
latin:passwordInput="false"
>
<Key
latin:keyStyle="webTabKeyStyle"
latin:keyWidth="6.5%p" />
<Key
latin:keyStyle="micKeyStyle"
latin:keyWidth="6.6%p" />
</case>
<default>
<Spacer
latin:horizontalGap="4.15%p" />
<Key
latin:keyStyle="webTabKeyStyle" />
</default>
</switch>
</case>
<default>
<switch>
<case
latin:hasSettingsKey="true"
latin:voiceKeyEnabled="true"
>
<Key
latin:keyStyle="settingsKeyStyle"
latin:keyWidth="6.5%p" />
<Key
latin:keyStyle="micKeyStyle"
latin:keyWidth="6.6%p" />
</case>
<case
latin:hasSettingsKey="true"
latin:voiceKeyEnabled="false"
>
<Spacer
latin:horizontalGap="4.15%p" />
<Key
latin:keyStyle="settingsKeyStyle" />
</case>
<case
latin:hasSettingsKey="false"
latin:voiceKeyEnabled="true"
>
<Spacer
latin:horizontalGap="4.15%p" />
<Key
latin:keyStyle="micKeyStyle" />
</case>
<default>
<Spacer
latin:horizontalGap="13.0%p" />
</default>
</switch>
</default>
</switch>
</merge>

148
java/res/xml-sw600dp/kbd_symbols.xml
View File

@ -23,7 +23,6 @@
latin:keyboardHeight="@dimen/keyboardHeight" latin:keyboardHeight="@dimen/keyboardHeight"
latin:maxKeyboardHeight="50%p" latin:maxKeyboardHeight="50%p"
latin:rowHeight="25%p" latin:rowHeight="25%p"
latin:keyWidth="10%p"
latin:horizontalGap="@dimen/key_horizontal_gap" latin:horizontalGap="@dimen/key_horizontal_gap"
latin:verticalGap="@dimen/key_bottom_gap" latin:verticalGap="@dimen/key_bottom_gap"
latin:popupKeyboardTemplate="@xml/kbd_popup_template" latin:popupKeyboardTemplate="@xml/kbd_popup_template"
@ -33,13 +32,13 @@
latin:keyboardLayout="@xml/kbd_key_styles" /> latin:keyboardLayout="@xml/kbd_key_styles" />
<include <include
latin:keyboardLayout="@xml/kbd_currency_key_styles" /> latin:keyboardLayout="@xml/kbd_currency_key_styles" />
<!-- This row is intentionally not marked as a top row -->
<Row <Row
latin:rowEdgeFlags="top" latin:keyWidth="9.1%p"
> >
<Key <Key
latin:keyLabel="1" latin:keyLabel="1"
latin:popupCharacters="¹,½,⅓,¼,⅛" latin:popupCharacters="¹,½,⅓,¼,⅛" />
latin:keyEdgeFlags="left" />
<Key <Key
latin:keyLabel="2" latin:keyLabel="2"
latin:popupCharacters="²,⅔" /> latin:popupCharacters="²,⅔" />
@ -63,15 +62,19 @@
latin:keyLabel="9" /> latin:keyLabel="9" />
<Key <Key
latin:keyLabel="0" latin:keyLabel="0"
latin:popupCharacters="ⁿ,∅" latin:popupCharacters="ⁿ,∅" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="9.2%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<Row> <Row
latin:keyWidth="9.0%p"
>
<Spacer
latin:horizontalGap="4.5%p" />
<Key <Key
latin:keyLabel="\@" latin:keyLabel="#" />
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="\#" />
<Key <Key
latin:keyStyle="currencyKeyStyle" /> latin:keyStyle="currencyKeyStyle" />
<Key <Key
@ -93,39 +96,122 @@
latin:popupCharacters="[,{,&lt;" /> latin:popupCharacters="[,{,&lt;" />
<Key <Key
latin:keyLabel=")" latin:keyLabel=")"
latin:popupCharacters="],},&gt;" latin:popupCharacters="],},&gt;" />
<Key
latin:keyStyle="returnKeyStyle"
latin:keyWidth="14.6%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<Row> <Row
latin:keyWidth="8.9%p"
>
<Key <Key
latin:keyStyle="altKeyStyle" latin:keyStyle="moreKeyStyle"
latin:keyWidth="15%p" latin:keyWidth="10.0%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:keyLabel="!" latin:keyLabel="&lt;"
latin:popupCharacters="¡" /> latin:popupCharacters="≤,«,‹" />
<!-- Note: DroidSans doesn't have double-high-reversed-quotation '\u201f' glyph. -->
<!-- latin:popupCharacters="“,”,„,‟,«,»" -->
<Key <Key
latin:keyLabel="&quot;" latin:keyLabel="&gt;"
latin:popupCharacters="“,”,«,»" latin:popupCharacters="≥,»,›" />
latin:maxPopupKeyboardColumn="6" />
<Key <Key
latin:keyLabel="\'" latin:keyLabel="="
latin:popupCharacters="‘,’,‚,‛" /> latin:popupCharacters="≠,≈" />
<Key <switch>
latin:keyLabel=":" /> <case
latin:languageCode="ru"
>
<Key
latin:keyLabel=":" />
</case>
<case
latin:mode="url"
>
<Key
latin:keyLabel="\'"
latin:popupCharacters="‘,’,‚,‛" />
</case>
<default>
<Key
latin:keyLabel=":" />
</default>
</switch>
<Key <Key
latin:keyLabel=";" /> latin:keyLabel=";" />
<switch>
<case
latin:languageCode="ru"
>
<Key
latin:keyLabel="\'"
latin:popupCharacters="‘,’,‚,‛" />
<!-- Note: DroidSans doesn't have double-high-reversed-quotation
'\u201f' glyph. -->
<!-- latin:popupCharacters="“,”,„,‟,«,»" -->
<Key
latin:keyLabel="&quot;"
latin:popupCharacters="“,”,«,»" />
<Key
latin:keyLabel="." />
<Key
latin:keyLabel="," />
</case>
<default>
<Key
latin:keyLabel="," />
<Key
latin:keyLabel="." />
<Key
latin:keyLabel="!"
latin:popupCharacters="¡" />
<Key
latin:keyLabel="\?"
latin:popupCharacters="¿" />
</default>
</switch>
<Key
latin:keyStyle="moreKeyStyle"
latin:keyWidth="10.1%p"
latin:keyEdgeFlags="right" />
</Row>
<!-- This row is intentionally not marked as a bottom row -->
<Row
latin:keyWidth="8.9%p"
>
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyLabelOption="alignLeft"
latin:keyWidth="13.0%p"
latin:keyEdgeFlags="left" />
<Key <Key
latin:keyLabel="/" /> latin:keyLabel="/" />
<Key <Key
latin:keyLabel="\?" latin:keyLabel="\@" />
latin:popupCharacters="¿" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyWidth="15%p" latin:keyWidth="38.5%p" />
latin:keyEdgeFlags="right" /> <switch>
<case
latin:languageCode="ru"
>
<Key
latin:keyLabel="_" />
<Key
latin:keyLabel="-" />
</case>
<default>
<!-- Note: DroidSans doesn't have double-high-reversed-quotation
'\u201f' glyph. -->
<!-- latin:popupCharacters="“,”,„,‟,«,»,‘,’,‚,‛" -->
<Key
latin:keyLabel="&quot;"
latin:popupCharacters="“,”,«,»,‘,’,‚,‛" />
<Key
latin:keyLabel="_" />
</default>
</switch>
<include
latin:keyboardLayout="@xml/kbd_settings" />
</Row> </Row>
<include latin:keyboardLayout="@xml/kbd_symbols_row4" />
</Keyboard> </Keyboard>

104
java/res/xml-sw600dp/kbd_symbols_shift.xml
View File

@ -23,7 +23,6 @@
latin:keyboardHeight="@dimen/keyboardHeight" latin:keyboardHeight="@dimen/keyboardHeight"
latin:maxKeyboardHeight="50%p" latin:maxKeyboardHeight="50%p"
latin:rowHeight="25%p" latin:rowHeight="25%p"
latin:keyWidth="10%p"
latin:horizontalGap="@dimen/key_horizontal_gap" latin:horizontalGap="@dimen/key_horizontal_gap"
latin:verticalGap="@dimen/key_bottom_gap" latin:verticalGap="@dimen/key_bottom_gap"
latin:popupKeyboardTemplate="@xml/kbd_popup_template" latin:popupKeyboardTemplate="@xml/kbd_popup_template"
@ -31,12 +30,12 @@
> >
<include <include
latin:keyboardLayout="@xml/kbd_key_styles" /> latin:keyboardLayout="@xml/kbd_key_styles" />
<!-- This row is intentionally not marked as a top row -->
<Row <Row
latin:rowEdgeFlags="top" latin:keyWidth="9.1%p"
> >
<Key <Key
latin:keyLabel="~" latin:keyLabel="~" />
latin:keyEdgeFlags="left" />
<Key <Key
latin:keyLabel="`" /> latin:keyLabel="`" />
<Key <Key
@ -59,15 +58,22 @@
latin:keyStyle="nonPasswordSymbolKeyStyle" latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="×" /> latin:keyLabel="×" />
<Key <Key
latin:keyLabel="{" /> latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="§"
latin:popupCharacters="¶" />
<Key <Key
latin:keyLabel="}" latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="Δ" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="9.2%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<Row> <Row
<Key latin:keyWidth="9.0%p"
latin:keyStyle="nonSpecialBackgroundTabKeyStyle" >
latin:keyEdgeFlags="left" /> <Spacer
latin:horizontalGap="4.5%p" />
<Key <Key
latin:keyStyle="nonPasswordSymbolKeyStyle" latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="£" /> latin:keyLabel="£" />
@ -79,52 +85,80 @@
latin:keyLabel="€" /> latin:keyLabel="€" />
<Key <Key
latin:keyStyle="nonPasswordSymbolKeyStyle" latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="°" latin:keyLabel="¥" />
latin:popupCharacters="′,″" />
<Key <Key
latin:keyLabel="^" latin:keyLabel="^"
latin:popupCharacters="↑,↓,←,→" /> latin:popupCharacters="↑,↓,←,→" />
<Key <Key
latin:keyLabel="_" /> latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="°"
latin:popupCharacters="′,″" />
<Key <Key
latin:keyLabel="=" latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:popupCharacters="≠,≈,∞" /> latin:keyLabel="±"
latin:popupCharacters="∞" />
<Key <Key
latin:keyLabel="[" /> latin:keyLabel="{" />
<Key <Key
latin:keyLabel="]" latin:keyLabel="}" />
<Key
latin:keyStyle="returnKeyStyle"
latin:keyWidth="14.6%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<Row> <Row
latin:keyWidth="8.9%p"
>
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="moreKeyStyle"
latin:keyWidth="15%p" latin:keyWidth="10.0%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:keyStyle="nonPasswordSymbolKeyStyle" latin:keyLabel="\\" />
latin:keyLabel="™" />
<Key
latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="®" />
<Key <Key
latin:keyStyle="nonPasswordSymbolKeyStyle" latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="©" /> latin:keyLabel="©" />
<Key <Key
latin:keyStyle="nonPasswordSymbolKeyStyle" latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="¶" latin:keyLabel="®" />
latin:popupCharacters="§" />
<Key <Key
latin:keyLabel="\\" /> latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="™" />
<Key <Key
latin:keyLabel="&lt;" latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:popupCharacters="≤,«,‹" /> latin:keyLabel="℅" />
<Key <Key
latin:keyLabel="&gt;" latin:keyLabel="[" />
latin:popupCharacters="≥,»,›" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyLabel="]" />
latin:keyWidth="15%p" <Key
latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="¡" />
<Key
latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="¿" />
<Key
latin:keyStyle="moreKeyStyle"
latin:keyWidth="10.1%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<include latin:keyboardLayout="@xml/kbd_symbols_shift_row4" /> <!-- This row is intentionally not marked as a bottom row -->
<Row
latin:keyWidth="8.9%p"
>
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyLabelOption="alignLeft"
latin:keyWidth="13.0%p"
latin:keyEdgeFlags="left" />
<Spacer
latin:horizontalGap="17.8%p" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="38.5%p" />
<Spacer
latin:horizontalGap="17.8%p" />
<include
latin:keyboardLayout="@xml/kbd_settings" />
</Row>
</Keyboard> </Keyboard>