aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-05-10 02:54:14 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-10 02:54:14 -0700
commitc44a3e07a39baec42da0478843ebb80ddc93d610 (patch)
tree1d7ed36118020c4b8126d022a632140b7373a0df /java
parent3b7d40f4643b9a6a6cb979e9493f56197bd89fc0 (diff)
parent2363d0c931d2d6dfd2299e03e86668493958a43a (diff)
downloadlatinime-c44a3e07a39baec42da0478843ebb80ddc93d610.tar.gz
latinime-c44a3e07a39baec42da0478843ebb80ddc93d610.tar.xz
latinime-c44a3e07a39baec42da0478843ebb80ddc93d610.zip
Merge "Tidy up 11-11-{7,8,9} 7-inch tablet layouts" into jb-dev
Diffstat (limited to 'java')
-rw-r--r--java/res/xml-sw600dp/rows_bulgarian.xml13
-rw-r--r--java/res/xml-sw600dp/rows_east_slavic.xml18
-rw-r--r--java/res/xml-sw600dp/rows_nordic.xml15
-rw-r--r--java/res/xml-sw600dp/rows_south_slavic.xml15
4 files changed, 24 insertions, 37 deletions
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_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="&#x044A;" />
<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_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_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" />