aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-05-10 11:56:30 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-10 11:56:30 -0700
commit16a9e842012b6700aa4b780aa64ddefaf9e8c5fe (patch)
treea939f3030601f558aba1159619b0b4055df630d0 /java
parent4319a2a52bcd64f71e238eaaf9f313656583f673 (diff)
parente6241e2543b815efaa5b2a8cbc5b031f1307f500 (diff)
downloadlatinime-16a9e842012b6700aa4b780aa64ddefaf9e8c5fe.tar.gz
latinime-16a9e842012b6700aa4b780aa64ddefaf9e8c5fe.tar.xz
latinime-16a9e842012b6700aa4b780aa64ddefaf9e8c5fe.zip
am e6241e25: Merge "Tidy up Arabic and Farsi 7-inch layouts" into jb-dev
* commit 'e6241e2543b815efaa5b2a8cbc5b031f1307f500': Tidy up Arabic and Farsi 7-inch layouts
Diffstat (limited to 'java')
-rw-r--r--java/res/xml-sw600dp/rows_arabic.xml11
-rw-r--r--java/res/xml-sw600dp/rows_farsi.xml25
2 files changed, 14 insertions, 22 deletions
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_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" />