commit fb5b4c4fc39499d03951671c1a9b67b3573dd11d
author Tadashi G. Takaoka <takaoka@google.com> Thu Mar 29 21:01:19 2012 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Fri Mar 30 18:20:52 2012 +0900
tree 597996a6086820383f5b0d5eada32a06d63b1878
parent 338ba2a236aea0d7ad6890a9e7bc26c2fe5bc364

Add language agnostic QWERTY subtype

Bug: 6010147
Change-Id: I705e38ac889172ae8b7c2a68e5c688f2ffc28320

java/res/xml/method.xml

diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index d6ded66..7a21a85 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -27,7 +27,7 @@
     cs: Czech/qwertz
     da: Danish/nordic
     de: German/qwertz
-    de_ZZ: German (QWERTY)/qwerty
+    de_QY: German (QWERTY)/qwerty
     el: Greek/greek
     en_US: English United States/qwerty
     en_GB: English Great Britain/qwerty
@@ -63,6 +63,7 @@
     tr: Turkish/qwerty
     uk: Ukrainian/east_slavic
     vi: Vietnamese/qwerty
+    zz_QY: QWERTY/qwerty
     -->
 <!-- TODO: use <lang>_keyboard icon instead of a common keyboard icon. -->
 <!-- If IME doesn't have an applicable subtype, the first subtype will be used as a default
@@ -74,7 +75,7 @@
             android:label="@string/subtype_en_US"
             android:imeSubtypeLocale="en_US"
             android:imeSubtypeMode="keyboard"
-            android:imeSubtypeExtraValue="TrySuppressingImeSwitcher,AsciiCapable,EnabledWhenDefaultIsNotAsciiCapable"
+            android:imeSubtypeExtraValue="TrySuppressingImeSwitcher,AsciiCapable"
     />
     <subtype android:icon="@drawable/ic_subtype_keyboard"
             android:label="@string/subtype_en_GB"
@@ -119,7 +120,7 @@
             android:label="@string/subtype_generic_qwerty"
             android:imeSubtypeLocale="de"
             android:imeSubtypeMode="keyboard"
-            android:imeSubtypeExtraValue="AsciiCapable,KeyboardLocale=de_ZZ"
+            android:imeSubtypeExtraValue="AsciiCapable,KeyboardLocale=de_QY"
     />
     <subtype android:icon="@drawable/ic_subtype_keyboard"
             android:label="@string/subtype_generic"
@@ -310,4 +311,10 @@
             android:imeSubtypeMode="keyboard"
             android:imeSubtypeExtraValue="AsciiCapable"
     />
+    <subtype android:icon="@drawable/ic_subtype_keyboard"
+            android:label="@string/subtype_qwerty"
+            android:imeSubtypeLocale="zz_QY"
+            android:imeSubtypeMode="keyboard"
+            android:imeSubtypeExtraValue="AsciiCapable,EnabledWhenDefaultIsNotAsciiCapable"
+    />
 </input-method>