diff options
Diffstat (limited to 'java')
31 files changed, 149 insertions, 327 deletions
diff --git a/java/res/xml-sw600dp/key_space.xml b/java/res/xml-sw600dp/key_space.xml index 4e1e15b55..234c80391 100644 --- a/java/res/xml-sw600dp/key_space.xml +++ b/java/res/xml-sw600dp/key_space.xml @@ -30,7 +30,7 @@ latin:keyStyle="languageSwitchKeyStyle" /> <Key latin:keyStyle="spaceKeyStyle" - latin:keyWidth="21.950%p" /> + latin:keyWidth="25.50%p" /> <Key latin:keyStyle="zwnjKeyStyle" /> </case> @@ -40,7 +40,7 @@ > <Key latin:keyStyle="spaceKeyStyle" - latin:keyWidth="30.850%p" /> + latin:keyWidth="34.00%p" /> <Key latin:keyStyle="zwnjKeyStyle" /> </case> @@ -51,13 +51,13 @@ latin:keyStyle="languageSwitchKeyStyle" /> <Key latin:keyStyle="spaceKeyStyle" - latin:keyWidth="30.850%p" /> + latin:keyWidth="34.00%p" /> </case> <!-- languageSwitchKeyEnabled="false" --> <default> <Key latin:keyStyle="spaceKeyStyle" - latin:keyWidth="39.750%p" /> + latin:keyWidth="42.50%p" /> </default> </switch> </merge> diff --git a/java/res/xml-sw600dp/row_hebrew4.xml b/java/res/xml-sw600dp/row_hebrew4.xml index 3d50c7554..90441fba8 100644 --- a/java/res/xml-sw600dp/row_hebrew4.xml +++ b/java/res/xml-sw600dp/row_hebrew4.xml @@ -22,19 +22,20 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Row - latin:keyWidth="8.9%p" + latin:keyWidth="8.5%p" > <Key latin:keyStyle="toSymbolKeyStyle" - latin:keyWidth="13.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/keys_f1f2" /> <include + latin:keyXPos="28.75%p" latin:keyboardLayout="@xml/key_space" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> <include - latin:keyXPos="-10.0%p" + latin:keyXPos="-8.5%p" latin:keyWidth="fillRight" latin:keyboardLayout="@xml/key_shortcut" /> </Row> diff --git a/java/res/xml-sw600dp/row_qwerty4.xml b/java/res/xml-sw600dp/row_qwerty4.xml index a41dc6480..5008696fd 100644 --- a/java/res/xml-sw600dp/row_qwerty4.xml +++ b/java/res/xml-sw600dp/row_qwerty4.xml @@ -22,22 +22,22 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Row - latin:keyWidth="8.9%p" + latin:keyWidth="8.5%p" > <Key latin:keyStyle="toSymbolKeyStyle" - latin:keyWidth="13.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/keys_f1f2" /> <include - latin:keyXPos="30.750%p" + latin:keyXPos="28.75%p" latin:keyboardLayout="@xml/key_space" /> <include latin:keyboardLayout="@xml/key_apostrophe" /> <include latin:keyboardLayout="@xml/key_dash" /> <include - latin:keyXPos="-10.00%p" + latin:keyXPos="-8.5%p" latin:keyWidth="fillRight" latin:keyboardLayout="@xml/key_shortcut" /> </Row> diff --git a/java/res/xml-sw600dp/row_symbols4.xml b/java/res/xml-sw600dp/row_symbols4.xml index 4c0ad2334..a4fe5faaa 100644 --- a/java/res/xml-sw600dp/row_symbols4.xml +++ b/java/res/xml-sw600dp/row_symbols4.xml @@ -22,17 +22,17 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Row - latin:keyWidth="8.9%p" + latin:keyWidth="8.5%p" > <Key latin:keyStyle="toAlphaKeyStyle" - latin:keyWidth="13.0%p" /> + latin:keyWidth="11.75%p" /> <Key latin:keyStyle="smileyKeyStyle" /> <Key latin:keyLabel="\@" /> <include - latin:keyXPos="30.750%p" + latin:keyXPos="28.75%p" latin:keyboardLayout="@xml/key_space" /> <Key latin:keyLabel=""" @@ -40,7 +40,7 @@ <Key latin:keyLabel="_" /> <include - latin:keyXPos="-10.0%p" + latin:keyXPos="-8.5%p" latin:keyWidth="fillRight" latin:keyboardLayout="@xml/key_shortcut" /> </Row> diff --git a/java/res/xml-sw600dp/row_symbols_shift4.xml b/java/res/xml-sw600dp/row_symbols_shift4.xml index 23db19304..ffb6e7fe5 100644 --- a/java/res/xml-sw600dp/row_symbols_shift4.xml +++ b/java/res/xml-sw600dp/row_symbols_shift4.xml @@ -22,18 +22,18 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Row - latin:keyWidth="8.9%p" + latin:keyWidth="8.5%p" > <Key latin:keyStyle="toAlphaKeyStyle" - latin:keyWidth="13.0%p" /> + latin:keyWidth="11.75%p" /> <Key latin:keyStyle="smileyKeyStyle" /> <include - latin:keyXPos="30.750%p" + latin:keyXPos="28.75%p" latin:keyboardLayout="@xml/key_space" /> <include - latin:keyXPos="-10.00%p" + latin:keyXPos="-8.5%p" latin:keyWidth="fillRight" latin:keyboardLayout="@xml/key_shortcut" /> </Row> diff --git a/java/res/xml-sw600dp/rows_10_10_7_symbols.xml b/java/res/xml-sw600dp/rows_10_10_7_symbols.xml index fe9f2fb5f..d016eb8d0 100644 --- a/java/res/xml-sw600dp/rows_10_10_7_symbols.xml +++ b/java/res/xml-sw600dp/rows_10_10_7_symbols.xml @@ -38,8 +38,7 @@ latin:keyWidth="8.5%p" > <include - latin:keyboardLayout="@xml/rowkeys_symbols2" - latin:keyXPos="4.5%p" /> + latin:keyboardLayout="@xml/rowkeys_symbols2" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> @@ -49,12 +48,12 @@ > <Key latin:keyStyle="toMoreSymbolKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_symbols3" /> <Key - latin:keyLabel="/" - latin:keyXPos="-8.5%p" + latin:keyStyle="toMoreSymbolKeyStyle" + latin:keyXPos="-11.75%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_10_10_7_symbols_shift.xml b/java/res/xml-sw600dp/rows_10_10_7_symbols_shift.xml index 9df112153..d4496b82f 100644 --- a/java/res/xml-sw600dp/rows_10_10_7_symbols_shift.xml +++ b/java/res/xml-sw600dp/rows_10_10_7_symbols_shift.xml @@ -38,8 +38,7 @@ latin:keyWidth="8.5%p" > <include - latin:keyboardLayout="@xml/rowkeys_symbols_shift2" - latin:keyXPos="4.5%p" /> + latin:keyboardLayout="@xml/rowkeys_symbols_shift2" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> @@ -49,9 +48,13 @@ > <Key latin:keyStyle="backFromMoreSymbolKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_symbols_shift3" /> + <Key + latin:keyStyle="backFromMoreSymbolKeyStyle" + latin:keyXPos="-11.75%p" + latin:keyWidth="fillRight" /> </Row> <include latin:keyboardLayout="@xml/row_symbols_shift4" /> diff --git a/java/res/xml-sw600dp/rows_arabic.xml b/java/res/xml-sw600dp/rows_arabic.xml index c796a508e..bc21854c0 100644 --- a/java/res/xml-sw600dp/rows_arabic.xml +++ b/java/res/xml-sw600dp/rows_arabic.xml @@ -24,7 +24,7 @@ <include latin:keyboardLayout="@xml/key_styles_common" /> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <include latin:keyboardLayout="@xml/rowkeys_arabic1" /> @@ -33,21 +33,20 @@ latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <include - latin:keyboardLayout="@xml/rowkeys_arabic2" - latin:keyXPos="4.5%p" /> + latin:keyboardLayout="@xml/rowkeys_arabic2" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <include latin:keyboardLayout="@xml/rowkeys_arabic3" - latin:keyXPos="10.0%p" /> + latin:keyXPos="7.727%p" /> </Row> <include latin:keyboardLayout="@xml/row_qwerty4" /> diff --git a/java/res/xml-sw600dp/rows_azerty.xml b/java/res/xml-sw600dp/rows_azerty.xml index fbfecb341..137c654a8 100644 --- a/java/res/xml-sw600dp/rows_azerty.xml +++ b/java/res/xml-sw600dp/rows_azerty.xml @@ -37,8 +37,7 @@ latin:keyWidth="8.5%p" > <include - latin:keyboardLayout="@xml/rowkeys_azerty2" - latin:keyXPos="4.5%p" /> + latin:keyboardLayout="@xml/rowkeys_azerty2" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> @@ -48,14 +47,14 @@ > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_azerty3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> <Key latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-10.0%p" + latin:keyXPos="-11.75%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_bulgarian.xml b/java/res/xml-sw600dp/rows_bulgarian.xml index 8c41f9634..682c72a0d 100644 --- a/java/res/xml-sw600dp/rows_bulgarian.xml +++ b/java/res/xml-sw600dp/rows_bulgarian.xml @@ -24,7 +24,7 @@ <include latin:keyboardLayout="@xml/key_styles_common" /> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <include latin:keyboardLayout="@xml/rowkeys_bulgarian1" @@ -34,28 +34,27 @@ latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <include - latin:keyboardLayout="@xml/rowkeys_bulgarian2" - latin:keyXPos="4.500%p" /> + latin:keyboardLayout="@xml/rowkeys_bulgarian2" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.65%p" > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_bulgarian3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> <Key latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-10.0%p" + latin:keyXPos="-11.75%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_colemak.xml b/java/res/xml-sw600dp/rows_colemak.xml index b34957c5b..a94381893 100644 --- a/java/res/xml-sw600dp/rows_colemak.xml +++ b/java/res/xml-sw600dp/rows_colemak.xml @@ -39,8 +39,7 @@ latin:keyWidth="8.5%p" > <include - latin:keyboardLayout="@xml/rowkeys_colemak2" - latin:keyXPos="4.5%p" /> + latin:keyboardLayout="@xml/rowkeys_colemak2" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> @@ -50,14 +49,14 @@ > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_colemak3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> <Key latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-10.0%p" + latin:keyXPos="-11.75%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_dvorak.xml b/java/res/xml-sw600dp/rows_dvorak.xml index d361c3e0c..83d1feece 100644 --- a/java/res/xml-sw600dp/rows_dvorak.xml +++ b/java/res/xml-sw600dp/rows_dvorak.xml @@ -39,8 +39,7 @@ latin:keyWidth="8.5%p" > <include - latin:keyboardLayout="@xml/rowkeys_dvorak2" - latin:keyXPos="4.5%p" /> + latin:keyboardLayout="@xml/rowkeys_dvorak2" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> @@ -50,12 +49,12 @@ > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_dvorak3" /> <Key latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-10.0%p" + latin:keyXPos="-11.75%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_east_slavic.xml b/java/res/xml-sw600dp/rows_east_slavic.xml index 3f8e50d15..76a6cc364 100644 --- a/java/res/xml-sw600dp/rows_east_slavic.xml +++ b/java/res/xml-sw600dp/rows_east_slavic.xml @@ -24,42 +24,34 @@ <include latin:keyboardLayout="@xml/key_styles_common" /> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <include latin:keyboardLayout="@xml/rowkeys_east_slavic1" latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" /> - <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN --> - <Key - latin:keyLabel="ъ" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <include - latin:keyboardLayout="@xml/rowkeys_east_slavic2" - latin:keyXPos="4.5%p" /> + latin:keyboardLayout="@xml/rowkeys_east_slavic2" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="7.363%p" + latin:keyWidth="7.727%p" > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_east_slavic3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> - <Key - latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-9.0%p" - latin:keyWidth="fillRight" /> </Row> <include latin:keyboardLayout="@xml/row_qwerty4" /> diff --git a/java/res/xml-sw600dp/rows_farsi.xml b/java/res/xml-sw600dp/rows_farsi.xml index 3b39b0af8..9daba6d0a 100644 --- a/java/res/xml-sw600dp/rows_farsi.xml +++ b/java/res/xml-sw600dp/rows_farsi.xml @@ -24,38 +24,31 @@ <include latin:keyboardLayout="@xml/key_styles_common" /> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <include latin:keyboardLayout="@xml/rowkeys_farsi1" /> - <Key - latin:keyStyle="deleteKeyStyle" - latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <include - latin:keyboardLayout="@xml/rowkeys_farsi2" - latin:keyXPos="4.5%p" /> + latin:keyboardLayout="@xml/rowkeys_farsi2" /> <Key - latin:keyStyle="enterKeyStyle" + latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > - <Key - latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.0%p" /> <include - latin:keyboardLayout="@xml/rowkeys_farsi3" /> + latin:keyboardLayout="@xml/rowkeys_farsi3" + latin:keyXPos="7.727%p" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> <Key - latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-10.0%p" - latin:keyWidth="fillRight" /> + latin:keyStyle="enterKeyStyle" + latin:keyWidth="fillBoth" /> </Row> <include latin:keyboardLayout="@xml/row_qwerty4" /> diff --git a/java/res/xml-sw600dp/rows_georgian.xml b/java/res/xml-sw600dp/rows_georgian.xml index 2e166bd62..89ef09f66 100644 --- a/java/res/xml-sw600dp/rows_georgian.xml +++ b/java/res/xml-sw600dp/rows_georgian.xml @@ -24,7 +24,7 @@ <include latin:keyboardLayout="@xml/key_styles_common" /> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <include latin:keyboardLayout="@xml/rowkeys_georgian1" @@ -34,28 +34,28 @@ latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <include latin:keyboardLayout="@xml/rowkeys_georgian2" - latin:keyXPos="4.5%p" /> + latin:keyXPos="5.875%p" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_georgian3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> <Key latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-9.0%p" + latin:keyXPos="-11.75%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_greek.xml b/java/res/xml-sw600dp/rows_greek.xml index 85d5c8a23..24cbd6289 100644 --- a/java/res/xml-sw600dp/rows_greek.xml +++ b/java/res/xml-sw600dp/rows_greek.xml @@ -24,7 +24,7 @@ <include latin:keyboardLayout="@xml/key_styles_common" /> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <include latin:keyboardLayout="@xml/key_greek_semicolon" /> @@ -36,28 +36,28 @@ latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <include latin:keyboardLayout="@xml/rowkeys_greek2" - latin:keyXPos="4.5%p" /> + latin:keyXPos="5.875%p" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_greek3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> <Key latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-9.0%p" + latin:keyXPos="-11.75%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_hebrew.xml b/java/res/xml-sw600dp/rows_hebrew.xml index 55ce69aa5..0a7bdf165 100644 --- a/java/res/xml-sw600dp/rows_hebrew.xml +++ b/java/res/xml-sw600dp/rows_hebrew.xml @@ -40,8 +40,7 @@ latin:keyWidth="8.5%p" > <include - latin:keyboardLayout="@xml/rowkeys_hebrew2" - latin:keyXPos="4.5%p" /> + latin:keyboardLayout="@xml/rowkeys_hebrew2" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> @@ -51,7 +50,7 @@ > <include latin:keyboardLayout="@xml/rowkeys_hebrew3" - latin:keyXPos="10.0%p" /> + latin:keyXPos="11.75%p" /> </Row> <include latin:keyboardLayout="@xml/row_hebrew4" /> diff --git a/java/res/xml-sw600dp/rows_hindi.xml b/java/res/xml-sw600dp/rows_hindi.xml index c26439faa..267e96fc9 100644 --- a/java/res/xml-sw600dp/rows_hindi.xml +++ b/java/res/xml-sw600dp/rows_hindi.xml @@ -24,7 +24,7 @@ <include latin:keyboardLayout="@xml/key_styles_common" /> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <include latin:keyboardLayout="@xml/rowkeys_hindi1" @@ -34,29 +34,24 @@ latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <include - latin:keyboardLayout="@xml/rowkeys_hindi2" - latin:keyXPos="4.5%p" /> + latin:keyboardLayout="@xml/rowkeys_hindi2" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="7.5%p" + latin:keyWidth="7.727%p" > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_hindi3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> - <Key - latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-7.5%p" - latin:keyWidth="fillRight" /> </Row> <include latin:keyboardLayout="@xml/row_qwerty4" /> diff --git a/java/res/xml-sw600dp/rows_nordic.xml b/java/res/xml-sw600dp/rows_nordic.xml index 4cc10d031..93373b637 100644 --- a/java/res/xml-sw600dp/rows_nordic.xml +++ b/java/res/xml-sw600dp/rows_nordic.xml @@ -24,7 +24,7 @@ <include latin:keyboardLayout="@xml/key_styles_common" /> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <include latin:keyboardLayout="@xml/rowkeys_nordic1" @@ -34,28 +34,29 @@ latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <include - latin:keyboardLayout="@xml/rowkeys_nordic2" - latin:keyXPos="4.5%p" /> + latin:keyboardLayout="@xml/rowkeys_nordic2" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> + <Spacer + latin:keyWidth="3.479%p" /> <include latin:keyboardLayout="@xml/rowkeys_qwerty3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> <Key latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-10.0%p" + latin:keyXPos="-11.75%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_qwerty.xml b/java/res/xml-sw600dp/rows_qwerty.xml index 9fc0e12b8..29aea3fdc 100644 --- a/java/res/xml-sw600dp/rows_qwerty.xml +++ b/java/res/xml-sw600dp/rows_qwerty.xml @@ -24,7 +24,7 @@ <include latin:keyboardLayout="@xml/key_styles_common" /> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <include latin:keyboardLayout="@xml/rowkeys_qwerty1" @@ -34,28 +34,28 @@ latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <include latin:keyboardLayout="@xml/rowkeys_qwerty2" - latin:keyXPos="4.5%p" /> + latin:keyXPos="5.875%p" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_qwerty3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> <Key latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-9.0%p" + latin:keyXPos="-11.75%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_qwertz.xml b/java/res/xml-sw600dp/rows_qwertz.xml index de86444e5..abbc7db89 100644 --- a/java/res/xml-sw600dp/rows_qwertz.xml +++ b/java/res/xml-sw600dp/rows_qwertz.xml @@ -24,7 +24,7 @@ <include latin:keyboardLayout="@xml/key_styles_common" /> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <include latin:keyboardLayout="@xml/rowkeys_qwertz1" @@ -34,28 +34,28 @@ latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <include latin:keyboardLayout="@xml/rowkeys_qwerty2" - latin:keyXPos="4.5%p" /> + latin:keyXPos="5.875%p" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_qwertz3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> <Key latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-9.0%p" + latin:keyXPos="-11.75%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_south_slavic.xml b/java/res/xml-sw600dp/rows_south_slavic.xml index 80eea6d43..68d86a9a2 100644 --- a/java/res/xml-sw600dp/rows_south_slavic.xml +++ b/java/res/xml-sw600dp/rows_south_slavic.xml @@ -24,7 +24,7 @@ <include latin:keyboardLayout="@xml/key_styles_common" /> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <include latin:keyboardLayout="@xml/rowkeys_south_slavic1" @@ -34,29 +34,24 @@ latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <include - latin:keyboardLayout="@xml/rowkeys_south_slavic2" - latin:keyXPos="4.5%p" /> + latin:keyboardLayout="@xml/rowkeys_south_slavic2" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="7.363%p" + latin:keyWidth="7.727%p" > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_south_slavic3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> - <Key - latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-9.0%p" - latin:keyWidth="fillRight" /> </Row> <include latin:keyboardLayout="@xml/row_qwerty4" /> diff --git a/java/res/xml-sw600dp/rows_spanish.xml b/java/res/xml-sw600dp/rows_spanish.xml index 6aef1d781..8c965b2ff 100644 --- a/java/res/xml-sw600dp/rows_spanish.xml +++ b/java/res/xml-sw600dp/rows_spanish.xml @@ -37,8 +37,7 @@ latin:keyWidth="8.5%p" > <include - latin:keyboardLayout="@xml/rowkeys_spanish2" - latin:keyXPos="4.5%p" /> + latin:keyboardLayout="@xml/rowkeys_spanish2" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> @@ -48,14 +47,14 @@ > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_qwerty3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> <Key latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-10.0%p" + latin:keyXPos="-11.75%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_symbols.xml b/java/res/xml-sw600dp/rows_symbols.xml index ada22dff6..57ec70de1 100644 --- a/java/res/xml-sw600dp/rows_symbols.xml +++ b/java/res/xml-sw600dp/rows_symbols.xml @@ -26,7 +26,7 @@ <include latin:keyboardLayout="@xml/key_styles_currency" /> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <include latin:keyboardLayout="@xml/rowkeys_symbols1" /> @@ -35,26 +35,26 @@ latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <include latin:keyboardLayout="@xml/rowkeys_symbols2" - latin:keyXPos="4.5%p" /> + latin:keyXPos="5.875%p" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <Key latin:keyStyle="toMoreSymbolKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_symbols3" /> <Key - latin:keyLabel="/" - latin:keyXPos="-9.0%p" + latin:keyStyle="toMoreSymbolKeyStyle" + latin:keyXPos="-11.75%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_symbols_shift.xml b/java/res/xml-sw600dp/rows_symbols_shift.xml index 0750670d6..c46661ec7 100644 --- a/java/res/xml-sw600dp/rows_symbols_shift.xml +++ b/java/res/xml-sw600dp/rows_symbols_shift.xml @@ -26,7 +26,7 @@ <include latin:keyboardLayout="@xml/key_styles_currency" /> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <include latin:keyboardLayout="@xml/rowkeys_symbols_shift1" /> @@ -35,23 +35,27 @@ latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <include latin:keyboardLayout="@xml/rowkeys_symbols_shift2" - latin:keyXPos="4.5%p" /> + latin:keyXPos="5.875%p" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <Key latin:keyStyle="backFromMoreSymbolKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_symbols_shift3" /> + <Key + latin:keyStyle="backFromMoreSymbolKeyStyle" + latin:keyXPos="-11.75%p" + latin:keyWidth="fillRight" /> </Row> <include latin:keyboardLayout="@xml/row_symbols_shift4" /> diff --git a/java/res/xml-sw600dp/rows_thai.xml b/java/res/xml-sw600dp/rows_thai.xml index fea1bafd1..c387081a3 100644 --- a/java/res/xml-sw600dp/rows_thai.xml +++ b/java/res/xml-sw600dp/rows_thai.xml @@ -24,43 +24,42 @@ <include latin:keyboardLayout="@xml/key_styles_common" /> <Row - latin:keyWidth="7.800%p" + latin:keyWidth="7.354%p" > <include latin:keyboardLayout="@xml/rowkeys_thai1" - latin:keyXPos="4.0%p" /> + latin:keyXPos="4.396%p" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillRight" /> </Row> <Row - latin:keyWidth="7.692%p" + latin:keyWidth="7.354%p" > <include - latin:keyboardLayout="@xml/rowkeys_thai2" /> + latin:keyboardLayout="@xml/rowkeys_thai2" + latin:keyXPos="0.719%p" /> </Row> <Row - latin:keyWidth="7.692%p" + latin:keyWidth="7.354%p" > <include latin:keyboardLayout="@xml/rowkeys_thai3" - latin:keyXPos="4.5%p" /> + latin:keyXPos="4.396%p" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="7.692%p" + latin:keyWidth="7.354%p" > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_thai4" /> - <Key - latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-10.0%p" - latin:keyWidth="fillRight" /> + <include + latin:keyboardLayout="@xml/keys_comma_period" /> </Row> <include latin:keyboardLayout="@xml/row_qwerty4" /> diff --git a/java/res/xml-sw768dp/rows_farsi.xml b/java/res/xml-sw768dp/rows_farsi.xml index 28ea6fff5..8a70df99d 100644 --- a/java/res/xml-sw768dp/rows_farsi.xml +++ b/java/res/xml-sw768dp/rows_farsi.xml @@ -24,7 +24,7 @@ <include latin:keyboardLayout="@xml/key_styles_common" /> <Row - latin:keyWidth="7.000%p" + latin:keyWidth="7.125%p" > <Key latin:keyStyle="tabKeyStyle" @@ -32,9 +32,6 @@ latin:keyWidth="7.969%p" /> <include latin:keyboardLayout="@xml/rowkeys_farsi1" /> - <Key - latin:keyStyle="deleteKeyStyle" - latin:keyWidth="fillBoth" /> </Row> <Row latin:keyWidth="7.125%p" @@ -46,22 +43,19 @@ <include latin:keyboardLayout="@xml/rowkeys_farsi2" /> <Key - latin:keyStyle="enterKeyStyle" + latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row latin:keyWidth="7.375%p" > - <Key - latin:keyStyle="shiftKeyStyle" - latin:keyWidth="13.829%p"/> <include - latin:keyboardLayout="@xml/rowkeys_farsi3" /> + latin:keyboardLayout="@xml/rowkeys_farsi3" + latin:keyXPos="13.829%p" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> <Key - latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-13.750%p" + latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> </Row> <include diff --git a/java/res/xml-sw768dp/rows_greek.xml b/java/res/xml-sw768dp/rows_greek.xml index c0b38dc15..cf2fa4013 100644 --- a/java/res/xml-sw768dp/rows_greek.xml +++ b/java/res/xml-sw768dp/rows_greek.xml @@ -35,6 +35,9 @@ <include latin:keyboardLayout="@xml/rowkeys_greek1" latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyWidth="fillBoth"/> </Row> <Row latin:keyWidth="8.125%p" diff --git a/java/res/xml-sw768dp/rows_nordic.xml b/java/res/xml-sw768dp/rows_nordic.xml index fbee1c3f0..9a452511e 100644 --- a/java/res/xml-sw768dp/rows_nordic.xml +++ b/java/res/xml-sw768dp/rows_nordic.xml @@ -56,6 +56,8 @@ <Key latin:keyStyle="shiftKeyStyle" latin:keyWidth="13.829%p" /> + <Spacer + latin:keyWidth="3.689%p" /> <include latin:keyboardLayout="@xml/rowkeys_qwerty3" /> <include diff --git a/java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java b/java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java index 004ee4c22..812bbc881 100644 --- a/java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java +++ b/java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java @@ -18,7 +18,6 @@ package com.android.inputmethod.accessibility; import android.graphics.Rect; import android.inputmethodservice.InputMethodService; -import android.os.Bundle; import android.support.v4.view.ViewCompat; import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat; import android.support.v4.view.accessibility.AccessibilityNodeProviderCompat; @@ -34,10 +33,6 @@ import com.android.inputmethod.keyboard.Key; import com.android.inputmethod.keyboard.Keyboard; import com.android.inputmethod.keyboard.KeyboardView; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; - /** * Exposes a virtual view sub-tree for {@link KeyboardView} and generates * {@link AccessibilityEvent}s for individual {@link Key}s. @@ -95,7 +90,6 @@ public class AccessibilityEntityProvider extends AccessibilityNodeProviderCompat final AccessibilityEvent event = AccessibilityEvent.obtain(eventType); event.setPackageName(mKeyboardView.getContext().getPackageName()); event.setClassName(key.getClass().getName()); - event.getText().add(keyDescription); event.setEnabled(true); final AccessibilityRecordCompat record = new AccessibilityRecordCompat(event); @@ -136,7 +130,6 @@ public class AccessibilityEntityProvider extends AccessibilityNodeProviderCompat ViewCompat.onInitializeAccessibilityNodeInfo(mKeyboardView, info); // Add the virtual children of the root View. - // TODO: Need to assign a unique ID to each key. final Keyboard keyboard = mKeyboardView.getKeyboard(); final Key[] keys = keyboard.mKeys; for (Key key : keys) { @@ -163,8 +156,6 @@ public class AccessibilityEntityProvider extends AccessibilityNodeProviderCompat // Obtain and initialize an AccessibilityNodeInfo with // information about the virtual view. info = AccessibilityNodeInfoCompat.obtain(); - info.addAction(AccessibilityNodeInfoCompat.ACTION_SELECT); - info.addAction(AccessibilityNodeInfoCompat.ACTION_CLEAR_SELECTION); info.setPackageName(mKeyboardView.getContext().getPackageName()); info.setClassName(key.getClass().getName()); info.setBoundsInParent(boundsInParent); @@ -173,155 +164,13 @@ public class AccessibilityEntityProvider extends AccessibilityNodeProviderCompat info.setSource(mKeyboardView, virtualViewId); info.setBoundsInScreen(boundsInScreen); info.setText(keyDescription); - info.setClickable(true); info.setEnabled(true); - info.setLongClickable(true); } return info; } /** - * Performs an accessibility action on a virtual view, i.e. a descendant of - * the host View, with the given <code>virtualViewId</code> or the host View itself if - * <code>virtualViewId</code> equals to {@link View#NO_ID}. - * - * @param virtualViewId A client defined virtual view id. - * @param action The action to perform. - * @param arguments Optional arguments. - * @return True if the action was performed. - * @see #createAccessibilityNodeInfo(int) - * @see AccessibilityNodeInfoCompat - */ - @Override - public boolean performAction(int virtualViewId, int action, Bundle arguments) { - if (virtualViewId == View.NO_ID) { - // Perform the action on the host View. - switch (action) { - case AccessibilityNodeInfoCompat.ACTION_SELECT: - if (!mKeyboardView.isSelected()) { - mKeyboardView.setSelected(true); - return mKeyboardView.isSelected(); - } - break; - case AccessibilityNodeInfoCompat.ACTION_CLEAR_SELECTION: - if (mKeyboardView.isSelected()) { - mKeyboardView.setSelected(false); - return !mKeyboardView.isSelected(); - } - break; - } - } else { - // Find the view that corresponds to the given id. - final Key child = mVirtualViewIdToKey.get(virtualViewId); - if (child == null) - return false; - - // Perform the action on a virtual view. - switch (action) { - case AccessibilityNodeInfoCompat.ACTION_SELECT: - // TODO: Provide some focus indicator. - return true; - case AccessibilityNodeInfoCompat.ACTION_CLEAR_SELECTION: - // TODO: Provide some clear focus indicator. - return true; - } - } - - return false; - } - - /** - * Finds {@link AccessibilityNodeInfoCompat}s by text. The match is case - * insensitive containment. The search is relative to the virtual view, i.e. - * a descendant of the host View, with the given <code>virtualViewId</code> or the host - * View itself <code>virtualViewId</code> equals to {@link View#NO_ID}. - * - * @param virtualViewId A client defined virtual view id which defined the - * root of the tree in which to perform the search. - * @param text The searched text. - * @return A list of node info. - * @see #createAccessibilityNodeInfo(int) - * @see AccessibilityNodeInfoCompat - */ - @Override - public List<AccessibilityNodeInfoCompat> findAccessibilityNodeInfosByText( - String text, int virtualViewId) { - final String searchedLowerCase = text.toLowerCase(); - final Keyboard keyboard = mKeyboardView.getKeyboard(); - - List<AccessibilityNodeInfoCompat> results = null; - - if (virtualViewId == View.NO_ID) { - for (Key key : keyboard.mKeys) { - results = findByTextAndPopulate(searchedLowerCase, key, results); - } - } else { - final Key key = mVirtualViewIdToKey.get(virtualViewId); - - results = findByTextAndPopulate(searchedLowerCase, key, results); - } - - if (results == null) { - return Collections.emptyList(); - } - - return results; - } - - /** - * Helper method for {@link #findAccessibilityNodeInfosByText(String, int)}. - * Takes a current set of results and matches a specified key against a - * lower-case search string. Returns an updated list of results. - * - * @param searchedLowerCase The lower-case search string. - * @param key The key to compare against. - * @param results The current list of results, or {@code null} if no results - * found. - * @return An updated list of results, or {@code null} if no results found. - */ - private List<AccessibilityNodeInfoCompat> findByTextAndPopulate(String searchedLowerCase, - Key key, List<AccessibilityNodeInfoCompat> results) { - if (!keyContainsText(key, searchedLowerCase)) { - return results; - } - - final int childVirtualViewId = generateVirtualViewIdForKey(key); - final AccessibilityNodeInfoCompat nodeInfo = createAccessibilityNodeInfo( - childVirtualViewId); - - if (results == null) { - results = new LinkedList<AccessibilityNodeInfoCompat>(); - } - - results.add(nodeInfo); - - return results; - } - - /** - * Returns whether a key's current description contains the lower-case - * search text. - * - * @param key The key to compare against. - * @param textLowerCase The lower-case search string. - * @return {@code true} if the key contains the search text. - */ - private boolean keyContainsText(Key key, String textLowerCase) { - if (key == null) { - return false; - } - - final String description = getKeyDescription(key); - - if (description == null) { - return false; - } - - return description.toLowerCase().contains(textLowerCase); - } - - /** * Returns the context-specific description for a {@link Key}. * * @param key The key to describe. diff --git a/java/src/com/android/inputmethod/latin/EditingUtils.java b/java/src/com/android/inputmethod/latin/EditingUtils.java index 7d673175e..93106ac27 100644 --- a/java/src/com/android/inputmethod/latin/EditingUtils.java +++ b/java/src/com/android/inputmethod/latin/EditingUtils.java @@ -38,8 +38,7 @@ public class EditingUtils { private static int getCursorPosition(InputConnection connection) { if (null == connection) return INVALID_CURSOR_POSITION; - ExtractedText extracted = connection.getExtractedText( - new ExtractedTextRequest(), 0); + final ExtractedText extracted = connection.getExtractedText(new ExtractedTextRequest(), 0); if (extracted == null) { return INVALID_CURSOR_POSITION; } |