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

Merge "Update Hebrew keyboard"

main
Tadashi G. Takaoka 2011-07-14 00:32:58 -07:00 committed by Android (Google) Code Review
parent d24df43eaf 1a55286738
commit 94c05c7d0f
27 changed files with 345 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
java/res/values/donottranslate-altchars.xml
View File

@ -47,6 +47,7 @@
<string name="alternates_for_currency_dollar">¢,£,€,¥,₱</string> <string name="alternates_for_currency_dollar">¢,£,€,¥,₱</string>
<string name="alternates_for_currency_euro">¢,£,$,¥,₱</string> <string name="alternates_for_currency_euro">¢,£,$,¥,₱</string>
<string name="alternates_for_currency_pound">¢,$,€,¥,₱</string> <string name="alternates_for_currency_pound">¢,$,€,¥,₱</string>
<string name="alternates_for_currency_general">¢,$,€,£,¥,₱</string>
<string name="alternates_for_smiley">":-)|:-) ,:-(|:-( ,;-)|;-) ,:-P|:-P ,=-O|=-O ,:-*|:-* ,:O|:O ,B-)|B-) ,:-$|:-$ ,:-!|:-! ,:-[|:-[ ,O:-)|O:-) ,:-\\\\\\\\|:-\\\\\\\\ ,:\'(|:\'( ,:-D|:-D "</string> <string name="alternates_for_smiley">":-)|:-) ,:-(|:-( ,;-)|;-) ,:-P|:-P ,=-O|=-O ,:-*|:-* ,:O|:O ,B-)|B-) ,:-$|:-$ ,:-!|:-! ,:-[|:-[ ,O:-)|O:-) ,:-\\\\\\\\|:-\\\\\\\\ ,:\'(|:\'( ,:-D|:-D "</string>
<string name="alternates_for_punctuation">"\\,,\?,!,:,-,\',\",(,),/,;,+,&amp;,\@"</string> <string name="alternates_for_punctuation">"\\,,\?,!,:,-,\',\",(,),/,;,+,&amp;,\@"</string>
<string name="alternates_for_web_tab_punctuation">".,\\,,\?,!,:,-,\',\",(,),/,;,+,&amp;,\@"</string> <string name="alternates_for_web_tab_punctuation">".,\\,,\?,!,:,-,\',\",(,),/,;,+,&amp;,\@"</string>

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

@ -50,12 +50,24 @@
latin:keyIconShifted="iconShiftedShiftKey" latin:keyIconShifted="iconShiftedShiftKey"
latin:parentStyle="functionalKeyStyle" latin:parentStyle="functionalKeyStyle"
latin:isSticky="true" /> latin:isSticky="true" />
<key-style <switch>
latin:styleName="deleteKeyStyle" <case latin:languageCode="iw">
latin:code="@integer/key_delete" <key-style
latin:keyIcon="iconDeleteKey" latin:styleName="deleteKeyStyle"
latin:parentStyle="functionalKeyStyle" latin:code="@integer/key_delete"
latin:isRepeatable="true" /> latin:keyIcon="iconDeleteRtlKey"
latin:parentStyle="functionalKeyStyle"
latin:isRepeatable="true" />
</case>
<default>
<key-style
latin:styleName="deleteKeyStyle"
latin:code="@integer/key_delete"
latin:keyIcon="iconDeleteKey"
latin:parentStyle="functionalKeyStyle"
latin:isRepeatable="true" />
</default>
</switch>
<key-style <key-style
latin:styleName="returnKeyStyle" latin:styleName="returnKeyStyle"
latin:code="@integer/key_return" latin:code="@integer/key_return"

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

@ -46,29 +46,9 @@
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:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="!"
latin:popupCharacters="!" />
<Key
latin:keyLabel="."
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="\?"
latin:popupCharacters="\?" />
</default>
</switch>
<include <include
latin:keyboardLayout="@xml/kbd_row3_right" /> latin:keyboardLayout="@xml/kbd_row3_comma_period" />
<include
latin:keyboardLayout="@xml/kbd_row3_smiley" />
</Row> </Row>
</merge> </merge>

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

@ -59,46 +59,15 @@
latin:keyWidth="39.750%p" /> latin:keyWidth="39.750%p" />
<switch> <switch>
<case <case
latin:mode="email" latin:languageCode="iw"
> >
<Key <include
latin:keyLabel="-" latin:keyboardLayout="@xml/kbd_row3_comma_period" />
latin:keyWidth="9.750%p" />
</case>
<case
latin:mode="url"
>
<Key
latin:keyLabel="/"
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel=":"
latin:popupCharacters=":"
latin:keyWidth="9.750%p" />
</case> </case>
<!-- not languageCode="iw" -->
<default> <default>
<Key <include
latin:keyLabel="\'" latin:keyboardLayout="@xml/kbd_row4_apostrophe_dash" />
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="&quot;"
latin:popupCharacters="&quot;"
latin:keyWidth="9.750%p" />
</default>
</switch>
<switch>
<case
latin:mode="email"
>
<Key
latin:keyLabel="_"
latin:keyWidth="9.750%p" />
</case>
<default>
<Key
latin:keyLabel="-"
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="_"
latin:popupCharacters="_"
latin:keyWidth="9.750%p" />
</default> </default>
</switch> </switch>
<Spacer <Spacer

0
java/res/xml-sw768dp/kbd_row3_right2.xml → java/res/xml-sw600dp/kbd_row3_comma_period.xml
View File

0
java/res/xml-sw600dp/kbd_row3_right.xml → java/res/xml-sw600dp/kbd_row3_smiley.xml
View File

63
java/res/xml-sw600dp/kbd_row4_apostrophe_dash.xml Normal file
View File

@ -0,0 +1,63 @@
<?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="email"
>
<Key
latin:keyLabel="-" />
</case>
<case
latin:mode="url"
>
<Key
latin:keyLabel="/"
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel=":"
latin:popupCharacters=":" />
</case>
<default>
<Key
latin:keyLabel="\'"
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="&quot;"
latin:popupCharacters="&quot;" />
</default>
</switch>
<switch>
<case
latin:mode="email"
>
<Key
latin:keyLabel="_" />
</case>
<default>
<Key
latin:keyLabel="-"
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="_"
latin:popupCharacters="_" />
</default>
</switch>
</merge>

2
java/res/xml-sw600dp/kbd_rows_arabic.xml
View File

@ -128,7 +128,7 @@
<Key <Key
latin:keyLabel="د" /> latin:keyLabel="د" />
<include <include
latin:keyboardLayout="@xml/kbd_row3_right" /> latin:keyboardLayout="@xml/kbd_row3_smiley" />
</Row> </Row>
<include latin:keyboardLayout="@xml/kbd_qwerty_row4" /> <include latin:keyboardLayout="@xml/kbd_qwerty_row4" />
</merge> </merge>

2
java/res/xml-sw600dp/kbd_rows_azerty.xml
View File

@ -149,7 +149,7 @@
</default> </default>
</switch> </switch>
<include <include
latin:keyboardLayout="@xml/kbd_row3_right" /> latin:keyboardLayout="@xml/kbd_row3_smiley" />
</Row> </Row>
<include <include
latin:keyboardLayout="@xml/kbd_qwerty_row4" /> latin:keyboardLayout="@xml/kbd_qwerty_row4" />

86
java/res/xml-sw600dp/kbd_rows_hebrew.xml
View File

@ -24,13 +24,11 @@
<include <include
latin:keyboardLayout="@xml/kbd_key_styles" /> latin:keyboardLayout="@xml/kbd_key_styles" />
<Row <Row
latin:keyWidth="8.600%p" latin:keyWidth="9.0%p"
latin:rowEdgeFlags="top" latin:rowEdgeFlags="top"
> >
<Key <include
latin:keyLabel="," /> latin:keyboardLayout="@xml/kbd_row4_apostrophe_dash" />
<Key
latin:keyLabel="." />
<Key <Key
latin:keyLabel="ק" /> latin:keyLabel="ק" />
<Key <Key
@ -54,48 +52,78 @@
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
latin:keyWidth="8.600%p" latin:keyWidth="9.0%p"
> >
<Key <Key
latin:keyLabel="ש" latin:keyLabel="ש"
latin:keyXPos="4.000%p" /> latin:keyXPos="4.500%p" />
<Key <Key
latin:keyLabel="ד" /> latin:keyLabel="ד" />
<Key <Key
latin:keyLabel="ג" latin:keyLabel="ג"
latin:popupCharacters="ג,ג׳" /> latin:popupCharacters="ג׳" />
<Key <Key
latin:keyLabel="כ" /> latin:keyLabel="כ" />
<Key <Key
latin:keyLabel="ע" /> latin:keyLabel="ע" />
<Key <Key
latin:keyLabel="י" latin:keyLabel="י"
latin:popupCharacters="י,ײַ" /> latin:popupCharacters="ײַ" />
<Key <Key
latin:keyLabel="ח" latin:keyLabel="ח"
latin:popupCharacters="ח,ח׳" /> latin:popupCharacters="ח׳" />
<Key <Key
latin:keyLabel="ל" /> latin:keyLabel="ל" />
<Key <Key
latin:keyLabel="ך" /> latin:keyLabel="ך" />
<Key <Key
latin:keyLabel="ף" /> latin:keyLabel="ף" />
<Key
latin:keyStyle="returnKeyStyle"
latin:keyXPos="-10.400%p"
latin:keyWidth="fillBoth"
latin:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
latin:keyWidth="8.600%p" latin:keyWidth="8.9%p"
> >
<Key <!-- kbd_row3_smiley -->
latin:keyStyle="shiftKeyStyle" <switch>
latin:keyWidth="10.000%p" <case
latin:keyEdgeFlags="left" /> latin:mode="email"
>
<Key
latin:keyLabel="\@"
latin:keyWidth="10.0%p"
latin:keyEdgeFlags="left" />
</case>
<case
latin:mode="url"
>
<Key
latin:keyLabel="-"
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="_"
latin:popupCharacters="_"
latin:keyWidth="10.0%p"
latin:keyEdgeFlags="left" />
</case>
<case
latin:imeAction="actionSearch"
>
<Key
latin:keyLabel=":"
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="+"
latin:popupCharacters="+"
latin:keyWidth="10.0%p"
latin:keyEdgeFlags="left" />
</case>
<default>
<Key
latin:keyStyle="smileyKeyStyle"
latin:keyWidth="10.0%p"
latin:keyEdgeFlags="left" />
</default>
</switch>
<Key <Key
latin:keyLabel="ז" latin:keyLabel="ז"
latin:popupCharacters="ז,ז׳" /> latin:popupCharacters="ז׳" />
<Key <Key
latin:keyLabel="ס" /> latin:keyLabel="ס" />
<Key <Key
@ -108,15 +136,19 @@
latin:keyLabel="מ" /> latin:keyLabel="מ" />
<Key <Key
latin:keyLabel="צ" latin:keyLabel="צ"
latin:popupCharacters="צ,צ׳" /> latin:popupCharacters="צ׳" />
<Key <Key
latin:keyLabel="ת" latin:keyLabel="ת"
latin:popupCharacters="ת,ת׳" /> latin:popupCharacters="ת׳" />
<Key <Key
latin:keyLabel="ץ" latin:keyLabel="ץ"
latin:popupCharacters="ץ,ץ׳" /> latin:popupCharacters="ץ׳" />
<include <Key
latin:keyboardLayout="@xml/kbd_row3_right" /> latin:keyStyle="returnKeyStyle"
latin:keyXPos="-10.400%p"
latin:keyWidth="fillBoth"
latin:keyEdgeFlags="right" />
</Row> </Row>
<include latin:keyboardLayout="@xml/kbd_qwerty_row4" /> <include
latin:keyboardLayout="@xml/kbd_qwerty_row4" />
</merge> </merge>

2
java/res/xml-sw600dp/kbd_rows_qwertz.xml
View File

@ -114,7 +114,7 @@
</default> </default>
</switch> </switch>
<include <include
latin:keyboardLayout="@xml/kbd_row3_right" /> latin:keyboardLayout="@xml/kbd_row3_smiley" />
</Row> </Row>
<include <include
latin:keyboardLayout="@xml/kbd_qwerty_row4" /> latin:keyboardLayout="@xml/kbd_qwerty_row4" />

2
java/res/xml-sw600dp/kbd_rows_russian.xml
View File

@ -139,7 +139,7 @@
</default> </default>
</switch> </switch>
<include <include
latin:keyboardLayout="@xml/kbd_row3_right" /> latin:keyboardLayout="@xml/kbd_row3_smiley" />
</Row> </Row>
<include <include
latin:keyboardLayout="@xml/kbd_qwerty_row4" /> latin:keyboardLayout="@xml/kbd_qwerty_row4" />

26
java/res/xml-sw600dp/kbd_rows_scandinavian.xml
View File

@ -134,32 +134,12 @@
latin:popupCharacters="@string/alternates_for_n" /> latin:popupCharacters="@string/alternates_for_n" />
<Key <Key
latin:keyLabel="m" /> latin:keyLabel="m" />
<switch> <include
<case latin:keyboardLayout="@xml/kbd_row3_comma_period" />
latin:mode="email"
>
<Key
latin:keyLabel="," />
<Key
latin:keyLabel="." />
</case>
<default>
<Key
latin:keyLabel=","
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="!"
latin:popupCharacters="!" />
<Key
latin:keyLabel="."
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="\?"
latin:popupCharacters="\?" />
</default>
</switch>
<Spacer <Spacer
latin:keyWidth="4.35%p" /> latin:keyWidth="4.35%p" />
<include <include
latin:keyboardLayout="@xml/kbd_row3_right" /> latin:keyboardLayout="@xml/kbd_row3_smiley" />
</Row> </Row>
<include <include
latin:keyboardLayout="@xml/kbd_qwerty_row4" /> latin:keyboardLayout="@xml/kbd_qwerty_row4" />

26
java/res/xml-sw600dp/kbd_rows_serbian.xml
View File

@ -114,30 +114,10 @@
latin:keyLabel="ђ" /> latin:keyLabel="ђ" />
<Key <Key
latin:keyLabel="ж" /> latin:keyLabel="ж" />
<switch>
<case
latin:mode="email"
>
<Key
latin:keyLabel="," />
<Key
latin:keyLabel="." />
</case>
<default>
<Key
latin:keyLabel=","
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="!"
latin:popupCharacters="!" />
<Key
latin:keyLabel="."
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="\?"
latin:popupCharacters="\?" />
</default>
</switch>
<include <include
latin:keyboardLayout="@xml/kbd_row3_right" /> latin:keyboardLayout="@xml/kbd_row3_comma_period" />
<include
latin:keyboardLayout="@xml/kbd_row3_smiley" />
</Row> </Row>
<include <include
latin:keyboardLayout="@xml/kbd_qwerty_row4" /> latin:keyboardLayout="@xml/kbd_qwerty_row4" />

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

@ -158,16 +158,13 @@
latin:keyStyle="spaceKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyXPos="30.750%p" latin:keyXPos="30.750%p"
latin:keyWidth="39.750%p" /> latin:keyWidth="39.750%p" />
<!-- Note: DroidSans doesn't have double-high-reversed-quotation <!-- Note: DroidSans doesn't have double-high-reversed-quotation '\u201f' glyph. -->
'\u201f' glyph. --> <!-- latin:popupCharacters="“,”,„,‟,«,»,‘,’,‚,‛" -->
<!-- latin:popupCharacters="“,”,„,‟,«,»,‘,’,‚,‛" -->
<Key <Key
latin:keyLabel="&quot;" latin:keyLabel="&quot;"
latin:popupCharacters="“,”,«,»,‘,’,‚,‛" latin:popupCharacters="“,”,«,»,‘,’,‚,‛" />
latin:keyWidth="9.750%p" />
<Key <Key
latin:keyLabel="_" latin:keyLabel="_" />
latin:keyWidth="9.750%p" />
<Spacer <Spacer
latin:keyXPos="-10.00%p" latin:keyXPos="-10.00%p"
latin:keyWidth="0%p" /> latin:keyWidth="0%p" />

24
java/res/xml-sw768dp/kbd_key_styles.xml
View File

@ -32,12 +32,24 @@
latin:keyIconShifted="iconShiftedShiftKey" latin:keyIconShifted="iconShiftedShiftKey"
latin:parentStyle="functionalKeyStyle" latin:parentStyle="functionalKeyStyle"
latin:isSticky="true" /> latin:isSticky="true" />
<key-style <switch>
latin:styleName="deleteKeyStyle" <case latin:languageCode="iw">
latin:code="@integer/key_delete" <key-style
latin:keyIcon="iconDeleteKey" latin:styleName="deleteKeyStyle"
latin:parentStyle="functionalKeyStyle" latin:code="@integer/key_delete"
latin:isRepeatable="true" /> latin:keyIcon="iconDeleteRtlKey"
latin:parentStyle="functionalKeyStyle"
latin:isRepeatable="true" />
</case>
<default>
<key-style
latin:styleName="deleteKeyStyle"
latin:code="@integer/key_delete"
latin:keyIcon="iconDeleteKey"
latin:parentStyle="functionalKeyStyle"
latin:isRepeatable="true" />
</default>
</switch>
<key-style <key-style
latin:styleName="returnKeyStyle" latin:styleName="returnKeyStyle"
latin:code="@integer/key_return" latin:code="@integer/key_return"

2
java/res/xml-sw768dp/kbd_qwerty_row3.xml
View File

@ -47,7 +47,7 @@
<Key <Key
latin:keyLabel="m" /> latin:keyLabel="m" />
<include <include
latin:keyboardLayout="@xml/kbd_row3_right2" /> latin:keyboardLayout="@xml/kbd_row3_comma_period" />
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-13.750%p" latin:keyXPos="-13.750%p"

37
java/res/xml-sw768dp/kbd_qwerty_row4.xml
View File

@ -90,41 +90,14 @@
latin:keyWidth="37.500%p" /> latin:keyWidth="37.500%p" />
<switch> <switch>
<case <case
latin:mode="email" latin:languageCode="iw"
> >
<Key <include
latin:keyLabel="-" /> latin:keyboardLayout="@xml/kbd_row3_comma_period" />
</case>
<case
latin:mode="url"
>
<Key
latin:keyLabel="/"
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel=":"
latin:popupCharacters=":" />
</case> </case>
<default> <default>
<Key <include
latin:keyLabel="\'" latin:keyboardLayout="@xml/kbd_row4_apostrophe_dash" />
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="&quot;"
latin:popupCharacters="&quot;" />
</default>
</switch>
<switch>
<case
latin:mode="email"
>
<Key
latin:keyLabel="_" />
</case>
<default>
<Key
latin:keyLabel="-"
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="_"
latin:popupCharacters="_" />
</default> </default>
</switch> </switch>
<switch> <switch>

46
java/res/xml-sw768dp/kbd_row3_comma_period.xml Normal file
View File

@ -0,0 +1,46 @@
<?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="email"
>
<Key
latin:keyLabel="," />
<Key
latin:keyLabel="." />
</case>
<default>
<Key
latin:keyLabel=","
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="!"
latin:popupCharacters="!" />
<Key
latin:keyLabel="."
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="\?"
latin:popupCharacters="\?" />
</default>
</switch>
</merge>

63
java/res/xml-sw768dp/kbd_row4_apostrophe_dash.xml Normal file
View File

@ -0,0 +1,63 @@
<?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="email"
>
<Key
latin:keyLabel="-" />
</case>
<case
latin:mode="url"
>
<Key
latin:keyLabel="/"
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel=":"
latin:popupCharacters=":" />
</case>
<default>
<Key
latin:keyLabel="\'"
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="&quot;"
latin:popupCharacters="&quot;" />
</default>
</switch>
<switch>
<case
latin:mode="email"
>
<Key
latin:keyLabel="_" />
</case>
<default>
<Key
latin:keyLabel="-"
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="_"
latin:popupCharacters="_" />
</default>
</switch>
</merge>

47
java/res/xml-sw768dp/kbd_rows_hebrew.xml
View File

@ -24,16 +24,15 @@
<include <include
latin:keyboardLayout="@xml/kbd_key_styles" /> latin:keyboardLayout="@xml/kbd_key_styles" />
<Row <Row
latin:keyWidth="8.000%p" latin:keyWidth="8.282%p"
> >
<Key <Key
latin:keyStyle="tabKeyStyle" latin:keyStyle="tabKeyStyle"
latin:keyLabelOption="alignLeft" latin:keyLabelOption="alignLeft"
latin:keyWidth="7.969%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <include
latin:keyLabel="," /> latin:keyboardLayout="@xml/kbd_row4_apostrophe_dash" />
<Key
latin:keyLabel="." />
<Key <Key
latin:keyLabel="ק" /> latin:keyLabel="ק" />
<Key <Key
@ -57,12 +56,12 @@
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
latin:keyWidth="8.000%p" latin:keyWidth="8.125%p"
> >
<Key <Key
latin:keyStyle="toSymbolKeyStyle" latin:keyStyle="toSymbolKeyStyle"
latin:keyLabelOption="alignLeft" latin:keyLabelOption="alignLeft"
latin:keyWidth="9.600%p" latin:keyWidth="11.172%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:keyLabel="ש" /> latin:keyLabel="ש" />
@ -70,39 +69,31 @@
latin:keyLabel="ד" /> latin:keyLabel="ד" />
<Key <Key
latin:keyLabel="ג" latin:keyLabel="ג"
latin:popupCharacters="ג,ג׳" /> latin:popupCharacters="ג׳" />
<Key <Key
latin:keyLabel="כ" /> latin:keyLabel="כ" />
<Key <Key
latin:keyLabel="ע" /> latin:keyLabel="ע" />
<Key <Key
latin:keyLabel="י" latin:keyLabel="י"
latin:popupCharacters="י,ײַ" /> latin:popupCharacters="ײַ" />
<Key <Key
latin:keyLabel="ח" latin:keyLabel="ח"
latin:popupCharacters="ח,ח׳" /> latin:popupCharacters="ח׳" />
<Key <Key
latin:keyLabel="ל" /> latin:keyLabel="ל" />
<Key <Key
latin:keyLabel="ך" /> latin:keyLabel="ך" />
<Key <Key
latin:keyLabel="ף" /> latin:keyLabel="ף" />
<Key
latin:keyStyle="returnKeyStyle"
latin:keyXPos="-10.400%p"
latin:keyWidth="fillBoth"
latin:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
latin:keyWidth="8.000%p" latin:keyWidth="8.047%p"
> >
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="13.200%p"
latin:keyEdgeFlags="left" />
<Key <Key
latin:keyLabel="ז" latin:keyLabel="ז"
latin:popupCharacters="ז,ז׳" /> latin:popupCharacters="ז׳"
latin:keyXPos="13.829%p" />
<Key <Key
latin:keyLabel="ס" /> latin:keyLabel="ס" />
<Key <Key
@ -115,13 +106,19 @@
latin:keyLabel="מ" /> latin:keyLabel="מ" />
<Key <Key
latin:keyLabel="צ" latin:keyLabel="צ"
latin:popupCharacters="צ,צ׳" /> latin:popupCharacters="צ׳" />
<Key <Key
latin:keyLabel="ת" latin:keyLabel="ת"
latin:popupCharacters="ת,ת׳" /> latin:popupCharacters="ת׳" />
<Key <Key
latin:keyLabel="ץ" latin:keyLabel="ץ"
latin:popupCharacters="ץ,ץ׳" /> latin:popupCharacters="ץ׳" />
<Key
latin:keyStyle="returnKeyStyle"
latin:keyXPos="-10.400%p"
latin:keyWidth="fillBoth"
latin:keyEdgeFlags="right" />
</Row> </Row>
<include latin:keyboardLayout="@xml/kbd_qwerty_row4" /> <include
latin:keyboardLayout="@xml/kbd_qwerty_row4" />
</merge> </merge>

2
java/res/xml-sw768dp/kbd_rows_russian.xml
View File

@ -123,7 +123,7 @@
<Key <Key
latin:keyLabel="ю" /> latin:keyLabel="ю" />
<include <include
latin:keyboardLayout="@xml/kbd_row3_right2" /> latin:keyboardLayout="@xml/kbd_row3_comma_period" />
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyWidth="fillBoth" latin:keyWidth="fillBoth"

2
java/res/xml-sw768dp/kbd_rows_scandinavian.xml
View File

@ -139,7 +139,7 @@
<Key <Key
latin:keyLabel="m" /> latin:keyLabel="m" />
<include <include
latin:keyboardLayout="@xml/kbd_row3_right2" /> latin:keyboardLayout="@xml/kbd_row3_comma_period" />
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-12.750%p" latin:keyXPos="-12.750%p"

2
java/res/xml-sw768dp/kbd_rows_serbian.xml
View File

@ -118,7 +118,7 @@
<Key <Key
latin:keyLabel="м" /> latin:keyLabel="м" />
<include <include
latin:keyboardLayout="@xml/kbd_row3_right2" /> latin:keyboardLayout="@xml/kbd_row3_comma_period" />
<Key <Key
latin:keyStyle="returnKeyStyle" latin:keyStyle="returnKeyStyle"
latin:keyXPos="-13.750%p" latin:keyXPos="-13.750%p"

8
java/res/xml/kbd_currency_key_styles.xml
View File

@ -80,6 +80,14 @@
latin:keyLabel="€" latin:keyLabel="€"
latin:popupCharacters="@string/alternates_for_currency_euro" /> latin:popupCharacters="@string/alternates_for_currency_euro" />
</case> </case>
<case
latin:languageCode="iw"
>
<key-style
latin:styleName="currencyKeyStyle"
latin:keyLabel="₪"
latin:popupCharacters="@string/alternates_for_currency_general" />
</case>
<!-- United Kingdom --> <!-- United Kingdom -->
<case <case
latin:countryCode="GB" latin:countryCode="GB"

2
java/res/xml/kbd_key_styles.xml
View File

@ -60,7 +60,7 @@
latin:parentStyle="functionalKeyStyle" latin:parentStyle="functionalKeyStyle"
latin:isSticky="true" /> latin:isSticky="true" />
<switch> <switch>
<case latin:localeCode="ar|iw"> <case latin:languageCode="ar|iw">
<key-style <key-style
latin:styleName="deleteKeyStyle" latin:styleName="deleteKeyStyle"
latin:code="@integer/key_delete" latin:code="@integer/key_delete"

23
java/res/xml/kbd_rows_hebrew.xml
View File

@ -18,9 +18,6 @@
*/ */
--> -->
<!-- This file for Hebrew 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 <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"
> >
@ -63,15 +60,18 @@
<Key <Key
latin:keyLabel="ד" /> latin:keyLabel="ד" />
<Key <Key
latin:keyLabel="ג" /> latin:keyLabel="ג"
latin:popupCharacters="ג׳" />
<Key <Key
latin:keyLabel="כ" /> latin:keyLabel="כ" />
<Key <Key
latin:keyLabel="ע" /> latin:keyLabel="ע" />
<Key <Key
latin:keyLabel="י" /> latin:keyLabel="י"
latin:popupCharacters="ײַ" />
<Key <Key
latin:keyLabel="ח" /> latin:keyLabel="ח"
latin:popupCharacters="ח׳" />
<Key <Key
latin:keyLabel="ל" /> latin:keyLabel="ל" />
<Key <Key
@ -86,6 +86,7 @@
> >
<Key <Key
latin:keyLabel="ז" latin:keyLabel="ז"
latin:popupCharacters="ז׳"
latin:keyXPos="5%p" latin:keyXPos="5%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
@ -99,13 +100,17 @@
<Key <Key
latin:keyLabel="מ" /> latin:keyLabel="מ" />
<Key <Key
latin:keyLabel="צ" /> latin:keyLabel="צ"
latin:popupCharacters="צ׳" />
<Key <Key
latin:keyLabel="ת" /> latin:keyLabel="ת"
latin:popupCharacters="ת׳" />
<Key <Key
latin:keyLabel="ץ" latin:keyLabel="ץ"
latin:popupCharacters="ץ׳"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
<!-- Here is 5%p space --> <!-- Here is 5%p space -->
</Row> </Row>
<include latin:keyboardLayout="@xml/kbd_qwerty_row4" /> <include
latin:keyboardLayout="@xml/kbd_qwerty_row4" />
</merge> </merge>