aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-09-04 01:57:26 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-04 01:57:26 -0700
commitd07c8f5ccfe3a90035e0a4e2437d1da401332bd0 (patch)
tree13957c64a09eddf71fcd6ad5068d857fd1fb51b2 /java/res
parentc964c34303f01a5c2d40cd79abe107d6e86663a4 (diff)
parent37183c889c19d93ddbf4a3d29cfa1dd0b557de7f (diff)
downloadlatinime-d07c8f5ccfe3a90035e0a4e2437d1da401332bd0.tar.gz
latinime-d07c8f5ccfe3a90035e0a4e2437d1da401332bd0.tar.xz
latinime-d07c8f5ccfe3a90035e0a4e2437d1da401332bd0.zip
am 37183c88: am 613aab23: Merge "Use string-array resource to define predefined-subtypes" into jb-mr1-dev
* commit '37183c889c19d93ddbf4a3d29cfa1dd0b557de7f': Use string-array resource to define predefined-subtypes
Diffstat (limited to 'java/res')
-rw-r--r--java/res/values/predefined-subtypes.xml7
1 files changed, 5 insertions, 2 deletions
diff --git a/java/res/values/predefined-subtypes.xml b/java/res/values/predefined-subtypes.xml
index 602f53eac..3bf0e617f 100644
--- a/java/res/values/predefined-subtypes.xml
+++ b/java/res/values/predefined-subtypes.xml
@@ -18,6 +18,9 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- Predefined subtypes (language:layout[:extraValue]) in semicolon separated format -->
- <string name="predefined_subtypes" translatable="false">de:qwerty:AsciiCapable;fr:qwertz:AsciiCapable</string>
+ <!-- Predefined subtypes (language:layout[:extraValue]) -->
+ <string-array name="predefined_subtypes" translatable="false">
+ <item>de:qwerty:AsciiCapable</item>
+ <item>fr:qwertz:AsciiCapable</item>
+ </string-array>
</resources>