aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-07-07 16:54:00 +0900
committerTadashi G. Takaoka <takaoka@google.com>2014-07-07 16:57:11 +0900
commit649de3f544d8e320ab812e829f637cd5f78b3d55 (patch)
tree28acc64d34a91f400f3622f82c1cb07ac2d96351 /java/res
parent59016206abe0e457ef8dd44b84d4aeac67824a07 (diff)
downloadlatinime-649de3f544d8e320ab812e829f637cd5f78b3d55.tar.gz
latinime-649de3f544d8e320ab812e829f637cd5f78b3d55.tar.xz
latinime-649de3f544d8e320ab812e829f637cd5f78b3d55.zip
Fix Sinhala keyboard for tablet device
This CL introduces fontDefault flag to keyLabelFlags of Key attribute to reset font specification to keyTypeface attribute. This is a followup of I065824f3fa. Bug: 6911143 Change-Id: I33bd4a23aaea73e2b17175ddd39053ec915d5451
Diffstat (limited to 'java/res')
-rw-r--r--java/res/values/attrs.xml1
-rw-r--r--java/res/xml-sw600dp/keys_exclamation_question.xml6
-rw-r--r--java/res/xml-sw600dp/rows_sinhala.xml3
3 files changed, 8 insertions, 2 deletions
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index 3206413ca..396c166ab 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -298,6 +298,7 @@
<flag name="alignLeftOfCenter" value="0x08" />
<flag name="fontNormal" value="0x10" />
<flag name="fontMonoSpace" value="0x20" />
+ <flag name="fontDefault" value="0x30" />
<flag name="followKeyLargeLetterRatio" value="0x40" />
<flag name="followKeyLetterRatio" value="0x80" />
<flag name="followKeyLabelRatio" value="0xC0" />
diff --git a/java/res/xml-sw600dp/keys_exclamation_question.xml b/java/res/xml-sw600dp/keys_exclamation_question.xml
index 97bd95d6a..cf2c61ead 100644
--- a/java/res/xml-sw600dp/keys_exclamation_question.xml
+++ b/java/res/xml-sw600dp/keys_exclamation_question.xml
@@ -23,8 +23,10 @@
>
<Key
latin:keySpec="!"
- latin:moreKeys="!text/morekeys_exclamation" />
+ latin:moreKeys="!text/morekeys_exclamation"
+ latin:keyLabelFlags="fontDefault" />
<Key
latin:keySpec="\?"
- latin:moreKeys="!text/morekeys_question" />
+ latin:moreKeys="!text/morekeys_question"
+ latin:keyLabelFlags="fontDefault" />
</merge>
diff --git a/java/res/xml-sw600dp/rows_sinhala.xml b/java/res/xml-sw600dp/rows_sinhala.xml
index 23c3f3aab..d3a5ca535 100644
--- a/java/res/xml-sw600dp/rows_sinhala.xml
+++ b/java/res/xml-sw600dp/rows_sinhala.xml
@@ -25,6 +25,7 @@
latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="8.182%p"
+ latin:keyLabelFlags="fontNormal|autoXScale"
>
<include
latin:keyboardLayout="@xml/rowkeys_sinhala1" />
@@ -34,6 +35,7 @@
</Row>
<Row
latin:keyWidth="8.182%p"
+ latin:keyLabelFlags="fontNormal|autoXScale"
>
<include
latin:keyboardLayout="@xml/rowkeys_sinhala2" />
@@ -43,6 +45,7 @@
</Row>
<Row
latin:keyWidth="8.182%p"
+ latin:keyLabelFlags="fontNormal|autoXScale"
>
<Key
latin:keyStyle="shiftKeyStyle"