aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-02-13 23:38:49 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-13 23:38:49 -0800
commit9286ff7f2b12c3e361ed0412088635ecd00942b0 (patch)
treeeaccc3f23546d580172574e0e2df8c8dc95d1687 /java
parent240cc54a0ae395c2be8b2790db0cd1f1c6a49614 (diff)
parente422c94634da4d0e61a9106addebf06cbcf70c2e (diff)
downloadlatinime-9286ff7f2b12c3e361ed0412088635ecd00942b0.tar.gz
latinime-9286ff7f2b12c3e361ed0412088635ecd00942b0.tar.xz
latinime-9286ff7f2b12c3e361ed0412088635ecd00942b0.zip
am e422c946: Fix test resource declarations and parsing a bit
* commit 'e422c94634da4d0e61a9106addebf06cbcf70c2e': Fix test resource declarations and parsing a bit
Diffstat (limited to 'java')
-rw-r--r--java/res/xml-sw600dp/key_styles_common.xml2
-rw-r--r--java/res/xml/key_styles_common.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/java/res/xml-sw600dp/key_styles_common.xml b/java/res/xml-sw600dp/key_styles_common.xml
index 6a79c6fc2..aa64f85b3 100644
--- a/java/res/xml-sw600dp/key_styles_common.xml
+++ b/java/res/xml-sw600dp/key_styles_common.xml
@@ -161,7 +161,7 @@
latin:parentStyle="baseForLayoutSwitchKeyStyle" />
<key-style
latin:styleName="comKeyStyle"
- latin:keySpec="!text/keylabel_for_popular_domain|!text/keylabel_for_popular_domain"
+ latin:keySpec="!text/keylabel_for_popular_domain"
latin:keyLabelFlags="autoXScale|fontNormal|hasPopupHint|preserveCase"
latin:moreKeys="!text/more_keys_for_popular_domain" />
</merge>
diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml
index f04fc45bb..2330ecb7f 100644
--- a/java/res/xml/key_styles_common.xml
+++ b/java/res/xml/key_styles_common.xml
@@ -149,7 +149,7 @@
latin:parentStyle="baseForLayoutSwitchKeyStyle" />
<key-style
latin:styleName="comKeyStyle"
- latin:keySpec="!text/keylabel_for_popular_domain|!text/keylabel_for_popular_domain"
+ latin:keySpec="!text/keylabel_for_popular_domain"
latin:keyLabelFlags="autoXScale|fontNormal|hasPopupHint|preserveCase"
latin:moreKeys="!text/more_keys_for_popular_domain"
latin:backgroundType="functional" />