diff options
| -rw-r--r-- | java/res/xml-sw600dp/kbd_qwerty_row3.xml | 4 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/kbd_row3_smiley.xml | 16 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/kbd_rows_arabic.xml | 33 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/kbd_rows_azerty.xml | 4 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/kbd_rows_bulgarian.xml | 7 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/kbd_rows_hebrew.xml | 38 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/kbd_rows_qwertz.xml | 4 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/kbd_rows_scandinavian.xml | 6 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/kbd_rows_serbian.xml | 4 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/kbd_rows_slavic.xml | 4 |
10 files changed, 30 insertions, 90 deletions
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row3.xml b/java/res/xml-sw600dp/kbd_qwerty_row3.xml index 4dabf633c..1a86bbfd4 100644 --- a/java/res/xml-sw600dp/kbd_qwerty_row3.xml +++ b/java/res/xml-sw600dp/kbd_qwerty_row3.xml @@ -48,6 +48,8 @@ <include latin:keyboardLayout="@xml/kbd_row3_comma_period" /> <include - latin:keyboardLayout="@xml/kbd_row3_smiley" /> + latin:keyboardLayout="@xml/kbd_row3_smiley" + latin:keyXPos="-8.9%p" + latin:keyWidth="fillBoth" /> </Row> </merge> diff --git a/java/res/xml-sw600dp/kbd_row3_smiley.xml b/java/res/xml-sw600dp/kbd_row3_smiley.xml index c94ec0cee..ee23a81ba 100644 --- a/java/res/xml-sw600dp/kbd_row3_smiley.xml +++ b/java/res/xml-sw600dp/kbd_row3_smiley.xml @@ -26,9 +26,7 @@ latin:mode="email" > <Key - latin:keyLabel="\@" - latin:keyXPos="-8.9%p" - latin:keyWidth="fillBoth" /> + latin:keyLabel="\@" /> </case> <case latin:mode="url" @@ -37,9 +35,7 @@ latin:keyLabel="-" latin:keyLabelFlags="hasUppercaseLetter" latin:keyHintLabel="_" - latin:moreKeys="_" - latin:keyXPos="-8.9%p" - latin:keyWidth="fillBoth" /> + latin:moreKeys="_" /> </case> <case latin:imeAction="actionSearch" @@ -48,15 +44,11 @@ latin:keyLabel=":" latin:keyLabelFlags="hasUppercaseLetter" latin:keyHintLabel="+" - latin:moreKeys="+" - latin:keyXPos="-8.9%p" - latin:keyWidth="fillBoth" /> + latin:moreKeys="+" /> </case> <default> <Key - latin:keyStyle="smileyKeyStyle" - latin:keyXPos="-8.9%p" - latin:keyWidth="fillBoth" /> + latin:keyStyle="smileyKeyStyle" /> </default> </switch> </merge> diff --git a/java/res/xml-sw600dp/kbd_rows_arabic.xml b/java/res/xml-sw600dp/kbd_rows_arabic.xml index 55c02f211..f96564f9d 100644 --- a/java/res/xml-sw600dp/kbd_rows_arabic.xml +++ b/java/res/xml-sw600dp/kbd_rows_arabic.xml @@ -145,37 +145,8 @@ <Row latin:keyWidth="8.0%p" > - <!-- kbd_row3_smiley --> - <switch> - <case - latin:mode="email" - > - <Key - latin:keyLabel="\@" /> - </case> - <case - latin:mode="url" - > - <Key - latin:keyLabel="-" - latin:keyLabelFlags="hasUppercaseLetter" - latin:keyHintLabel="_" - latin:moreKeys="_" /> - </case> - <case - latin:imeAction="actionSearch" - > - <Key - latin:keyLabel=":" - latin:keyLabelFlags="hasUppercaseLetter" - latin:keyHintLabel="+" - latin:moreKeys="+" /> - </case> - <default> - <Key - latin:keyStyle="smileyKeyStyle" /> - </default> - </switch> + <include + latin:keyboardLayout="@xml/kbd_row3_smiley" /> <!-- \u0626: ARABIC LETTER YEH WITH HAMZA ABOVE --> <Key latin:keyLabel="ئ" /> diff --git a/java/res/xml-sw600dp/kbd_rows_azerty.xml b/java/res/xml-sw600dp/kbd_rows_azerty.xml index c122e53f3..9e2bc69b5 100644 --- a/java/res/xml-sw600dp/kbd_rows_azerty.xml +++ b/java/res/xml-sw600dp/kbd_rows_azerty.xml @@ -123,7 +123,9 @@ <include latin:keyboardLayout="@xml/kbd_row3_comma_period" /> <include - latin:keyboardLayout="@xml/kbd_row3_smiley" /> + latin:keyboardLayout="@xml/kbd_row3_smiley" + latin:keyXPos="-8.9%p" + latin:keyWidth="fillRight" /> </Row> <include latin:keyboardLayout="@xml/kbd_qwerty_row4" /> diff --git a/java/res/xml-sw600dp/kbd_rows_bulgarian.xml b/java/res/xml-sw600dp/kbd_rows_bulgarian.xml index ebdf92895..22e743516 100644 --- a/java/res/xml-sw600dp/kbd_rows_bulgarian.xml +++ b/java/res/xml-sw600dp/kbd_rows_bulgarian.xml @@ -107,11 +107,10 @@ latin:keyLabel="ю" /> <include latin:keyboardLayout="@xml/kbd_row3_comma_period" /> - <Spacer - latin:keyXPos="-10.000%p" - latin:keyWidth="0%p" /> <include - latin:keyboardLayout="@xml/kbd_row3_smiley" /> + latin:keyboardLayout="@xml/kbd_row3_smiley" + latin:keyXPos="-8.9%p" + latin:keyWidth="fillRight" /> </Row> <include latin:keyboardLayout="@xml/kbd_qwerty_row4" /> diff --git a/java/res/xml-sw600dp/kbd_rows_hebrew.xml b/java/res/xml-sw600dp/kbd_rows_hebrew.xml index 4166745b7..5c4194cd4 100644 --- a/java/res/xml-sw600dp/kbd_rows_hebrew.xml +++ b/java/res/xml-sw600dp/kbd_rows_hebrew.xml @@ -80,41 +80,9 @@ <Row latin:keyWidth="8.9%p" > - <!-- kbd_row3_smiley --> - <switch> - <case - latin:mode="email" - > - <Key - latin:keyLabel="\@" - latin:keyWidth="10.0%p" /> - </case> - <case - latin:mode="url" - > - <Key - latin:keyLabel="-" - latin:keyLabelFlags="hasUppercaseLetter" - latin:keyHintLabel="_" - latin:moreKeys="_" - latin:keyWidth="10.0%p" /> - </case> - <case - latin:imeAction="actionSearch" - > - <Key - latin:keyLabel=":" - latin:keyLabelFlags="hasUppercaseLetter" - latin:keyHintLabel="+" - latin:moreKeys="+" - latin:keyWidth="10.0%p" /> - </case> - <default> - <Key - latin:keyStyle="smileyKeyStyle" - latin:keyWidth="10.0%p" /> - </default> - </switch> + <include + latin:keyboardLayout="@xml/kbd_row3_smiley" + latin:keyWidth="10.0%p" /> <Key latin:keyLabel="ז" latin:moreKeys="ז׳" /> diff --git a/java/res/xml-sw600dp/kbd_rows_qwertz.xml b/java/res/xml-sw600dp/kbd_rows_qwertz.xml index ed250e15a..bc08d07ce 100644 --- a/java/res/xml-sw600dp/kbd_rows_qwertz.xml +++ b/java/res/xml-sw600dp/kbd_rows_qwertz.xml @@ -90,7 +90,9 @@ <include latin:keyboardLayout="@xml/kbd_row3_comma_period" /> <include - latin:keyboardLayout="@xml/kbd_row3_smiley" /> + latin:keyboardLayout="@xml/kbd_row3_smiley" + latin:keyXPos="-8.9%p" + latin:keyWidth="fillBoth" /> </Row> <include latin:keyboardLayout="@xml/kbd_qwerty_row4" /> diff --git a/java/res/xml-sw600dp/kbd_rows_scandinavian.xml b/java/res/xml-sw600dp/kbd_rows_scandinavian.xml index 6d14d89c2..6d9164eb2 100644 --- a/java/res/xml-sw600dp/kbd_rows_scandinavian.xml +++ b/java/res/xml-sw600dp/kbd_rows_scandinavian.xml @@ -130,10 +130,10 @@ latin:keyLabel="m" /> <include latin:keyboardLayout="@xml/kbd_row3_comma_period" /> - <Spacer - latin:keyWidth="4.35%p" /> <include - latin:keyboardLayout="@xml/kbd_row3_smiley" /> + latin:keyboardLayout="@xml/kbd_row3_smiley" + latin:keyXPos="-8.9%p" + latin:keyWidth="fillRight" /> </Row> <include latin:keyboardLayout="@xml/kbd_qwerty_row4" /> diff --git a/java/res/xml-sw600dp/kbd_rows_serbian.xml b/java/res/xml-sw600dp/kbd_rows_serbian.xml index db7560cdc..7e918bb91 100644 --- a/java/res/xml-sw600dp/kbd_rows_serbian.xml +++ b/java/res/xml-sw600dp/kbd_rows_serbian.xml @@ -111,7 +111,9 @@ <include latin:keyboardLayout="@xml/kbd_row3_comma_period" /> <include - latin:keyboardLayout="@xml/kbd_row3_smiley" /> + latin:keyboardLayout="@xml/kbd_row3_smiley" + latin:keyXPos="-8.9%p" + latin:keyWidth="fillBoth" /> </Row> <include latin:keyboardLayout="@xml/kbd_qwerty_row4" /> diff --git a/java/res/xml-sw600dp/kbd_rows_slavic.xml b/java/res/xml-sw600dp/kbd_rows_slavic.xml index dc6f010fd..aa5adfd01 100644 --- a/java/res/xml-sw600dp/kbd_rows_slavic.xml +++ b/java/res/xml-sw600dp/kbd_rows_slavic.xml @@ -117,7 +117,9 @@ <include latin:keyboardLayout="@xml/kbd_row3_comma_period" /> <include - latin:keyboardLayout="@xml/kbd_row3_smiley" /> + latin:keyboardLayout="@xml/kbd_row3_smiley" + latin:keyXPos="-8.9%p" + latin:keyWidth="fillBoth" /> </Row> <include latin:keyboardLayout="@xml/kbd_qwerty_row4" /> |