diff --git a/java/res/xml-iw/keyboard_set.xml b/java/res/xml-iw/keyboard_set.xml
index 538f656b24aae0bd51eec00d5700740915657e29..6c51fb085bcb85929c19971a7a965a06000fbb4a 100644
--- a/java/res/xml-iw/keyboard_set.xml
+++ b/java/res/xml-iw/keyboard_set.xml
@@ -26,10 +26,10 @@
latin:enableProximityCharsCorrection="true" />
<Element
latin:elementName="symbols"
- latin:elementKeyboard="@xml/kbd_symbols" />
+ latin:elementKeyboard="@xml/kbd_hebrew_symbols" />
<Element
latin:elementName="symbolsShifted"
- latin:elementKeyboard="@xml/kbd_symbols_shift" />
+ latin:elementKeyboard="@xml/kbd_hebrew_symbols_shift" />
<Element
latin:elementName="phone"
latin:elementKeyboard="@xml/kbd_phone" />
diff --git a/java/res/xml-sw600dp/kbd_hebrew_symbols.xml b/java/res/xml-sw600dp/kbd_hebrew_symbols.xml
new file mode 100644
index 0000000000000000000000000000000000000000..66254dea0c9b904041d7aa5feece43d972c352a9
--- /dev/null
+++ b/java/res/xml-sw600dp/kbd_hebrew_symbols.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<Keyboard
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <include
+ latin:keyboardLayout="@xml/rows_10_10_7_symbols" />
+</Keyboard>
diff --git a/java/res/xml-sw600dp/kbd_hebrew_symbols_shift.xml b/java/res/xml-sw600dp/kbd_hebrew_symbols_shift.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3c5ed5e092e77175c2e062aad0bb5c0cf30a44fb
--- /dev/null
+++ b/java/res/xml-sw600dp/kbd_hebrew_symbols_shift.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<Keyboard
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <include
+ latin:keyboardLayout="@xml/rows_10_10_7_symbols_shift" />
+</Keyboard>
diff --git a/java/res/xml-sw768dp/rows_10_10_7_symbols.xml b/java/res/xml-sw768dp/rows_10_10_7_symbols.xml
index 9901decec5a1e9de07a9858fc8e06a0c51a4dea5..1d61d999b078db254168659b6146f27d48807e49 100644
--- a/java/res/xml-sw768dp/rows_10_10_7_symbols.xml
+++ b/java/res/xml-sw768dp/rows_10_10_7_symbols.xml
@@ -36,7 +36,6 @@
latin:keyboardLayout="@xml/rowkeys_symbols1" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-9.219%p"
latin:keyWidth="fillRight" />
</Row>
<Row
@@ -50,7 +49,6 @@
latin:keyboardLayout="@xml/rowkeys_symbols2" />
<Key
latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-15.704%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
diff --git a/java/res/xml-sw768dp/rows_10_10_7_symbols_shift.xml b/java/res/xml-sw768dp/rows_10_10_7_symbols_shift.xml
index b6aa202464df1dbd33f8f845ab9a50973d0a53fb..d22f8331d26248163c2ceb97c2751a18a9489ed6 100644
--- a/java/res/xml-sw768dp/rows_10_10_7_symbols_shift.xml
+++ b/java/res/xml-sw768dp/rows_10_10_7_symbols_shift.xml
@@ -36,7 +36,6 @@
latin:keyboardLayout="@xml/rowkeys_symbols_shift1" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-9.219%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
@@ -50,7 +49,6 @@
latin:keyboardLayout="@xml/rowkeys_symbols_shift2" />
<Key
latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-15.704%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
diff --git a/java/res/xml-sw768dp/rows_arabic.xml b/java/res/xml-sw768dp/rows_arabic.xml
index d5f287e2f7e57cfbdad1cf282aaea9c7164f955e..eaa64e5af9894c6b30772e62f07565b8e35854a1 100644
--- a/java/res/xml-sw768dp/rows_arabic.xml
+++ b/java/res/xml-sw768dp/rows_arabic.xml
@@ -29,12 +29,11 @@
<Key
latin:keyStyle="tabKeyStyle"
latin:keyLabelFlags="alignLeft"
- latin:keyWidth="7.500%p" />
+ latin:keyWidth="7.969%p" />
<include
latin:keyboardLayout="@xml/rowkeys_arabic1" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-11.500%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
@@ -43,12 +42,11 @@
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyLabelFlags="alignLeft"
- latin:keyWidth="9.375%p" />
+ latin:keyWidth="11.172%p" />
<include
latin:keyboardLayout="@xml/rowkeys_arabic2" />
<Key
latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-9.375%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
@@ -56,7 +54,7 @@
>
<include
latin:keyboardLayout="@xml/rowkeys_arabic3"
- latin:keyXPos="12.750%p" />
+ latin:keyXPos="13.829%p" />
</Row>
<include
latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/java/res/xml-sw768dp/rows_azerty.xml b/java/res/xml-sw768dp/rows_azerty.xml
index 3637ce7d418a46debb85ef8dfbaccf00a2d12326..1fc1a0630a1fa5043cefe83fb44444882ee017af 100644
--- a/java/res/xml-sw768dp/rows_azerty.xml
+++ b/java/res/xml-sw768dp/rows_azerty.xml
@@ -35,7 +35,6 @@
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-9.219%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
@@ -49,7 +48,6 @@
latin:keyboardLayout="@xml/rowkeys_azerty2" />
<Key
latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-15.704%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
@@ -64,7 +62,6 @@
latin:keyboardLayout="@xml/keys_comma_period" />
<Key
latin:keyStyle="shiftKeyStyle"
- latin:keyXPos="-13.750%p"
latin:keyWidth="fillBoth" />
</Row>
<include
diff --git a/java/res/xml-sw768dp/rows_bulgarian.xml b/java/res/xml-sw768dp/rows_bulgarian.xml
index 5f59f708713c6d7430910992efe7b08da417bb38..cb05fd5aa89771ee23fbf10e9374c283862500bb 100644
--- a/java/res/xml-sw768dp/rows_bulgarian.xml
+++ b/java/res/xml-sw768dp/rows_bulgarian.xml
@@ -24,11 +24,12 @@
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
- latin:keyWidth="7.333%p"
+ latin:keyWidth="7.186%p"
>
<Key
latin:keyStyle="tabKeyStyle"
- latin:keyLabelFlags="alignLeft" />
+ latin:keyLabelFlags="alignLeft"
+ latin:keyWidth="7.969%p" />
<include
latin:keyboardLayout="@xml/rowkeys_bulgarian1"
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
@@ -37,12 +38,12 @@
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="7.194%p"
+ latin:keyWidth="7.186%p"
>
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyLabelFlags="alignLeft"
- latin:keyWidth="9.375%p" />
+ latin:keyWidth="11.172%p" />
<include
latin:keyboardLayout="@xml/rowkeys_bulgarian2" />
<Key
@@ -54,7 +55,7 @@
>
<Key
latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="14.375%p" />
+ latin:keyWidth="13.829%p" />
<include
latin:keyboardLayout="@xml/rowkeys_bulgarian3" />
<include
diff --git a/java/res/xml-sw768dp/rows_east_slavic.xml b/java/res/xml-sw768dp/rows_east_slavic.xml
index ba57b75c4ef987c1777de58f3b1da80677937394..480881bb6ec687e5d00f886fb6cfd71daac9a71c 100644
--- a/java/res/xml-sw768dp/rows_east_slavic.xml
+++ b/java/res/xml-sw768dp/rows_east_slavic.xml
@@ -24,11 +24,12 @@
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
- latin:keyWidth="7.125%p"
+ latin:keyWidth="7.000%p"
>
<Key
latin:keyStyle="tabKeyStyle"
- latin:keyLabelFlags="alignLeft" />
+ latin:keyLabelFlags="alignLeft"
+ latin:keyWidth="7.969%p" />
<include
latin:keyboardLayout="@xml/rowkeys_east_slavic1"
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
@@ -40,25 +41,24 @@
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="7.125%p"
+ latin:keyWidth="7.000%p"
>
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyLabelFlags="alignLeft"
- latin:keyWidth="9.375%p" />
+ latin:keyWidth="11.172%p" />
<include
latin:keyboardLayout="@xml/rowkeys_east_slavic2" />
<Key
latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-9.375%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="7.125%p"
+ latin:keyWidth="7.000%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="12.750%p" />
+ latin:keyWidth="13.829%p" />
<include
latin:keyboardLayout="@xml/rowkeys_east_slavic3" />
<include
diff --git a/java/res/xml-sw768dp/rows_farsi.xml b/java/res/xml-sw768dp/rows_farsi.xml
index b969ff21cce24ed34fd1e897b11c0c15722da96b..28ea6fff5472e4da5c6527e912c351e1f4c66acc 100644
--- a/java/res/xml-sw768dp/rows_farsi.xml
+++ b/java/res/xml-sw768dp/rows_farsi.xml
@@ -24,11 +24,12 @@
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
- latin:keyWidth="7.125%p"
+ latin:keyWidth="7.000%p"
>
<Key
latin:keyStyle="tabKeyStyle"
- latin:keyLabelFlags="alignLeft" />
+ latin:keyLabelFlags="alignLeft"
+ latin:keyWidth="7.969%p" />
<include
latin:keyboardLayout="@xml/rowkeys_farsi1" />
<Key
@@ -46,7 +47,6 @@
latin:keyboardLayout="@xml/rowkeys_farsi2" />
<Key
latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-9.375%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
diff --git a/java/res/xml-sw768dp/rows_georgian.xml b/java/res/xml-sw768dp/rows_georgian.xml
index 0471e8f1cd49f1d26e02ba712d79e5815079a7b6..3805b5d88b9b98869d88195aeb16f161c77390e6 100644
--- a/java/res/xml-sw768dp/rows_georgian.xml
+++ b/java/res/xml-sw768dp/rows_georgian.xml
@@ -35,7 +35,6 @@
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-9.219%p"
latin:keyWidth="fillBoth"/>
</Row>
<Row
@@ -49,7 +48,6 @@
latin:keyboardLayout="@xml/rowkeys_georgian2" />
<Key
latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-15.704%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
diff --git a/java/res/xml-sw768dp/rows_greek.xml b/java/res/xml-sw768dp/rows_greek.xml
index 983abe14c0ee3459cd87cb50dcb86f2fca604973..c0b38dc15d76f1365bfc15ae7b087896361e72f3 100644
--- a/java/res/xml-sw768dp/rows_greek.xml
+++ b/java/res/xml-sw768dp/rows_greek.xml
@@ -47,7 +47,6 @@
latin:keyboardLayout="@xml/rowkeys_greek2" />
<Key
latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-15.704%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
@@ -62,7 +61,6 @@
latin:keyboardLayout="@xml/keys_comma_period" />
<Key
latin:keyStyle="shiftKeyStyle"
- latin:keyXPos="-13.750%p"
latin:keyWidth="fillBoth" />
</Row>
<include
diff --git a/java/res/xml-sw768dp/rows_hebrew.xml b/java/res/xml-sw768dp/rows_hebrew.xml
index 891872ccca85c5ab49f65b8d464eede2e9ac67f6..476071a5ebf8d88899979c8dd700de545b5d1bd5 100644
--- a/java/res/xml-sw768dp/rows_hebrew.xml
+++ b/java/res/xml-sw768dp/rows_hebrew.xml
@@ -36,7 +36,6 @@
latin:keyboardLayout="@xml/rowkeys_hebrew1" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-12.000%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
@@ -45,20 +44,19 @@
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyLabelFlags="alignLeft"
- latin:keyWidth="11.172%p" />
+ latin:keyWidth="10.167%p" />
<include
latin:keyboardLayout="@xml/rowkeys_hebrew2" />
- </Row>
+ <Key
+ latin:keyStyle="enterKeyStyle"
+ latin:keyWidth="fillBoth" />
+ </Row>
<Row
latin:keyWidth="8.047%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_hebrew3"
latin:keyXPos="13.829%p" />
- <Key
- latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-10.400%p"
- latin:keyWidth="fillBoth" />
</Row>
<include
latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/java/res/xml-sw768dp/rows_nordic.xml b/java/res/xml-sw768dp/rows_nordic.xml
index 3489724690e37694cdb44841de485301917569d3..fbee1c3f00a15b05b9ca84196fc47b1372d559b4 100644
--- a/java/res/xml-sw768dp/rows_nordic.xml
+++ b/java/res/xml-sw768dp/rows_nordic.xml
@@ -29,42 +29,40 @@
<Key
latin:keyStyle="tabKeyStyle"
latin:keyLabelFlags="alignLeft"
- latin:keyWidth="7.500%p" />
+ latin:keyWidth="7.969%p" />
<include
latin:keyboardLayout="@xml/rowkeys_nordic1"
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-11.500%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="7.375%p"
+ latin:keyWidth="7.227%p"
>
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyLabelFlags="alignLeft"
- latin:keyWidth="9.375%p" />
+ latin:keyWidth="11.172%p" />
<include
latin:keyboardLayout="@xml/rowkeys_nordic2" />
<Key
latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-9.375%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="7.375%p"
+ latin:keyWidth="7.227%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="12.750%p" />
+ latin:keyWidth="13.829%p" />
<include
latin:keyboardLayout="@xml/rowkeys_qwerty3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
<Key
latin:keyStyle="shiftKeyStyle"
- latin:keyXPos="-12.750%p"
+ latin:keyXPos="-13.750%p"
latin:keyWidth="fillRight" />
</Row>
<include
diff --git a/java/res/xml-sw768dp/rows_qwerty.xml b/java/res/xml-sw768dp/rows_qwerty.xml
index 8f0b762c5471d70c7673700b9807d5aa55bdaf4b..edfb4011df896288a886f6c4621e5cca296082ac 100644
--- a/java/res/xml-sw768dp/rows_qwerty.xml
+++ b/java/res/xml-sw768dp/rows_qwerty.xml
@@ -35,7 +35,6 @@
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-9.219%p"
latin:keyWidth="fillBoth"/>
</Row>
<Row
@@ -49,7 +48,6 @@
latin:keyboardLayout="@xml/rowkeys_qwerty2" />
<Key
latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-15.704%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
diff --git a/java/res/xml-sw768dp/rows_qwertz.xml b/java/res/xml-sw768dp/rows_qwertz.xml
index e3d1c61f04b955421b223c21de076f331bddeb66..7e755067dba4b0f0135887f80457fc26b11d815b 100644
--- a/java/res/xml-sw768dp/rows_qwertz.xml
+++ b/java/res/xml-sw768dp/rows_qwertz.xml
@@ -35,7 +35,6 @@
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-9.219%p"
latin:keyWidth="fillBoth"/>
</Row>
<Row
@@ -49,7 +48,6 @@
latin:keyboardLayout="@xml/rowkeys_qwerty2" />
<Key
latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-15.704%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
diff --git a/java/res/xml-sw768dp/rows_south_slavic.xml b/java/res/xml-sw768dp/rows_south_slavic.xml
index 0de8ff84c86dff44b44e6ed91bb02c3042204469..7ea0ff4658df6920d5bdf73a671db1a01b7abdcd 100644
--- a/java/res/xml-sw768dp/rows_south_slavic.xml
+++ b/java/res/xml-sw768dp/rows_south_slavic.xml
@@ -24,21 +24,21 @@
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
- latin:keyWidth="7.125%p"
+ latin:keyWidth="7.000%p"
>
<Key
latin:keyStyle="tabKeyStyle"
- latin:keyLabelFlags="alignLeft" />
+ latin:keyLabelFlags="alignLeft"
+ latin:keyWidth="7.969%p" />
<include
latin:keyboardLayout="@xml/rowkeys_south_slavic1"
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-9.219%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="7.250%p"
+ latin:keyWidth="7.000%p"
>
<Key
latin:keyStyle="toSymbolKeyStyle"
@@ -48,11 +48,10 @@
latin:keyboardLayout="@xml/rowkeys_south_slavic2" />
<Key
latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-15.704%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="7.250%p"
+ latin:keyWidth="7.000%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
@@ -61,6 +60,9 @@
latin:keyboardLayout="@xml/rowkeys_south_slavic3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
+ <Key
+ latin:keyStyle="shiftKeyStyle"
+ latin:keyWidth="fillBoth" />
</Row>
<include
latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/java/res/xml-sw768dp/rows_spanish.xml b/java/res/xml-sw768dp/rows_spanish.xml
index e4690f396704bf6d3475cd14faa4ae5e7512f17d..fc3388d537dadc36db066b2d1039d9ce4dd404d9 100644
--- a/java/res/xml-sw768dp/rows_spanish.xml
+++ b/java/res/xml-sw768dp/rows_spanish.xml
@@ -35,7 +35,6 @@
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-9.219%p"
latin:keyWidth="fillBoth"/>
</Row>
<Row
@@ -49,7 +48,6 @@
latin:keyboardLayout="@xml/rowkeys_spanish2" />
<Key
latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-15.704%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
diff --git a/java/res/xml-sw768dp/rows_symbols.xml b/java/res/xml-sw768dp/rows_symbols.xml
index 3902aef8eaa86b86a69fc7f07936cb85d3358c9f..ed2df18d7578427d0042c5f4af7dc6937d27f020 100644
--- a/java/res/xml-sw768dp/rows_symbols.xml
+++ b/java/res/xml-sw768dp/rows_symbols.xml
@@ -36,7 +36,6 @@
latin:keyboardLayout="@xml/rowkeys_symbols1" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-9.219%p"
latin:keyWidth="fillRight" />
</Row>
<Row
@@ -50,7 +49,6 @@
latin:keyboardLayout="@xml/rowkeys_symbols2" />
<Key
latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-15.704%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
diff --git a/java/res/xml-sw768dp/rows_symbols_shift.xml b/java/res/xml-sw768dp/rows_symbols_shift.xml
index 7cfff37415d88a6569d6b0f723821f217e4dd832..30e1df0bfc44233044aa570054420de4d14455f3 100644
--- a/java/res/xml-sw768dp/rows_symbols_shift.xml
+++ b/java/res/xml-sw768dp/rows_symbols_shift.xml
@@ -36,7 +36,6 @@
latin:keyboardLayout="@xml/rowkeys_symbols_shift1" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-9.219%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
@@ -50,7 +49,6 @@
latin:keyboardLayout="@xml/rowkeys_symbols_shift2" />
<Key
latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-15.704%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
diff --git a/java/res/xml-sw768dp/rows_thai_symbols.xml b/java/res/xml-sw768dp/rows_thai_symbols.xml
index 4a251b7700283b5f4559a68dd351b8f86becbbac..20f22bc5b6ad39ab1d33749972ee100ea357e352 100644
--- a/java/res/xml-sw768dp/rows_thai_symbols.xml
+++ b/java/res/xml-sw768dp/rows_thai_symbols.xml
@@ -33,7 +33,6 @@
latin:keyXPos="7.969%p" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-9.219%p"
latin:keyWidth="fillRight" />
</Row>
<Row
@@ -57,7 +56,6 @@
latin:keyboardLayout="@xml/rowkeys_symbols2" />
<Key
latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-15.704%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
diff --git a/java/res/xml-sw768dp/rows_thai_symbols_shift.xml b/java/res/xml-sw768dp/rows_thai_symbols_shift.xml
index 21002c6c8daf6d55bc5b1fe7da142155d74e6f6c..467dd19adbbb46345b6d947944ddeef36e84f45c 100644
--- a/java/res/xml-sw768dp/rows_thai_symbols_shift.xml
+++ b/java/res/xml-sw768dp/rows_thai_symbols_shift.xml
@@ -33,7 +33,6 @@
latin:keyXPos="7.969%p" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-9.219%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
@@ -57,7 +56,6 @@
latin:keyboardLayout="@xml/rowkeys_symbols_shift2" />
<Key
latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-15.704%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
diff --git a/java/res/xml/kbd_hebrew_symbols.xml b/java/res/xml/kbd_hebrew_symbols.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7e075df48ebddfdeb961549d065fd20f2b41d68d
--- /dev/null
+++ b/java/res/xml/kbd_hebrew_symbols.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<Keyboard
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <include
+ latin:keyboardLayout="@xml/rows_symbols" />
+</Keyboard>
diff --git a/java/res/xml/kbd_hebrew_symbols_shift.xml b/java/res/xml/kbd_hebrew_symbols_shift.xml
new file mode 100644
index 0000000000000000000000000000000000000000..25db3c84d9fd20a371acf31a43c547b4fe382df9
--- /dev/null
+++ b/java/res/xml/kbd_hebrew_symbols_shift.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<Keyboard
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <include
+ latin:keyboardLayout="@xml/rows_symbols_shift" />
+</Keyboard>
diff --git a/java/res/xml/rows_east_slavic.xml b/java/res/xml/rows_east_slavic.xml
index 01936125028b78f0e07a696e52b44ad93c9a4052..5d3d768f30ef15203e367d196cb996e7fa903e04 100644
--- a/java/res/xml/rows_east_slavic.xml
+++ b/java/res/xml/rows_east_slavic.xml
@@ -36,11 +36,11 @@
latin:keyboardLayout="@xml/rowkeys_east_slavic2" />
</Row>
<Row
- latin:keyWidth="8.5%p"
+ latin:keyWidth="8.711%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="11.75%p" />
+ latin:keyWidth="10.8%p" />
<include
latin:keyboardLayout="@xml/rowkeys_east_slavic3" />
<Key
diff --git a/java/res/xml/rows_nordic.xml b/java/res/xml/rows_nordic.xml
index 51d20e83fdcc587880b0fb544670958225ae0cde..3068917f5a85c906d24d1507a769022400e9f07e 100644
--- a/java/res/xml/rows_nordic.xml
+++ b/java/res/xml/rows_nordic.xml
@@ -36,17 +36,20 @@
latin:keyboardLayout="@xml/rowkeys_nordic2" />
</Row>
<Row
- latin:keyWidth="10%p"
+ latin:keyWidth="9.2%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="15%p"
latin:visualInsetsRight="1%p" />
+ <Spacer
+ latin:keyWidth="2.8%p" />
<include
latin:keyboardLayout="@xml/rowkeys_qwerty3" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyWidth="fillBoth"
+ latin:keyXPos="-15%p"
+ latin:keyWidth="fillRight"
latin:visualInsetsLeft="1%p" />
</Row>
<include
diff --git a/java/res/xml/rows_south_slavic.xml b/java/res/xml/rows_south_slavic.xml
index 31bb38984ae9868e93be1b39420408542a449956..05442848d003b829e8d30ac5604210f654685066 100644
--- a/java/res/xml/rows_south_slavic.xml
+++ b/java/res/xml/rows_south_slavic.xml
@@ -36,11 +36,11 @@
latin:keyboardLayout="@xml/rowkeys_south_slavic2" />
</Row>
<Row
- latin:keyWidth="8.5%p"
+ latin:keyWidth="8.711%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="11.75%p" />
+ latin:keyWidth="10.8%p" />
<include
latin:keyboardLayout="@xml/rowkeys_south_slavic3" />
<Key