Merge "Rename keyboard XML files"

java/res/values/attrs.xml

@@ -388,6 +388,7 @@
         <attr name="parentStyle" format="string" />
     </declare-styleable>
 
+    <!-- TODO: Should be removed. This is no longer required if InputMethodSubtype is supported. -->
     <declare-styleable name="KeyboardSet">
         <!-- Locale of the keyboard layouts -->
         <attr name="keyboardLocale" format="string" />

java/res/xml-be/keyboard_set.xml

@@ -23,7 +23,7 @@
     latin:keyboardLocale="be">
     <Element
         latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_slavic" />
+        latin:elementKeyboard="@xml/kbd_east_slavic" />
     <Element
         latin:elementName="symbols"
         latin:elementKeyboard="@xml/kbd_symbols" />

java/res/xml-da/keyboard_set.xml

@@ -23,7 +23,7 @@
     latin:keyboardLocale="da">
     <Element
         latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_scandinavian" />
+        latin:elementKeyboard="@xml/kbd_nordic" />
     <Element
         latin:elementName="symbols"
         latin:elementKeyboard="@xml/kbd_symbols" />

java/res/xml-et/keyboard_set.xml

@@ -23,7 +23,7 @@
     latin:keyboardLocale="et">
     <Element
         latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_scandinavian" />
+        latin:elementKeyboard="@xml/kbd_nordic" />
     <Element
         latin:elementName="symbols"
         latin:elementKeyboard="@xml/kbd_symbols" />

java/res/xml-fi/keyboard_set.xml

@@ -23,7 +23,7 @@
     latin:keyboardLocale="fi">
     <Element
         latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_scandinavian" />
+        latin:elementKeyboard="@xml/kbd_nordic" />
     <Element
         latin:elementName="symbols"
         latin:elementKeyboard="@xml/kbd_symbols" />

java/res/xml-ky/keyboard_set.xml

@@ -23,7 +23,7 @@
     latin:keyboardLocale="ky">
     <Element
         latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_slavic" />
+        latin:elementKeyboard="@xml/kbd_east_slavic" />
     <Element
         latin:elementName="symbols"
         latin:elementKeyboard="@xml/kbd_symbols" />

java/res/xml-mk/keyboard_set.xml

@@ -23,7 +23,7 @@
     latin:keyboardLocale="mk">
     <Element
         latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_serbian" />
+        latin:elementKeyboard="@xml/kbd_south_slavic" />
     <Element
         latin:elementName="symbols"
         latin:elementKeyboard="@xml/kbd_symbols" />

java/res/xml-nb/keyboard_set.xml

@@ -23,7 +23,7 @@
     latin:keyboardLocale="nb">
     <Element
         latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_scandinavian" />
+        latin:elementKeyboard="@xml/kbd_nordic" />
     <Element
         latin:elementName="symbols"
         latin:elementKeyboard="@xml/kbd_symbols" />

java/res/xml-ru/keyboard_set.xml

@@ -23,7 +23,7 @@
     latin:keyboardLocale="ru">
     <Element
         latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_slavic" />
+        latin:elementKeyboard="@xml/kbd_east_slavic" />
     <Element
         latin:elementName="symbols"
         latin:elementKeyboard="@xml/kbd_symbols" />

java/res/xml-sr/keyboard_set.xml

@@ -23,7 +23,7 @@
     latin:keyboardLocale="sr">
     <Element
         latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_serbian" />
+        latin:elementKeyboard="@xml/kbd_south_slavic" />
     <Element
         latin:elementName="symbols"
         latin:elementKeyboard="@xml/kbd_symbols" />

java/res/xml-sv/keyboard_set.xml

@@ -23,7 +23,7 @@
     latin:keyboardLocale="sv">
     <Element
         latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_scandinavian" />
+        latin:elementKeyboard="@xml/kbd_nordic" />
     <Element
         latin:elementName="symbols"
         latin:elementKeyboard="@xml/kbd_symbols" />

java/res/xml-sw600dp/rows_east_slavic.xml

@@ -27,7 +27,7 @@
         latin:keyWidth="7.60%p"
     >
         <include
-            latin:keyboardLayout="@xml/rowkeys_slavic1" />
+            latin:keyboardLayout="@xml/rowkeys_east_slavic1" />
         <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
         <Key
             latin:keyLabel="&#x044A;" />
@@ -40,7 +40,7 @@
         latin:keyWidth="7.60%p"
     >
         <include
-            latin:keyboardLayout="@xml/rowkeys_slavic2"
+            latin:keyboardLayout="@xml/rowkeys_east_slavic2"
             latin:keyXPos="2.25%p" />
         <Key
             latin:keyStyle="enterKeyStyle"
@@ -53,7 +53,7 @@
         <Key
             latin:keyStyle="shiftKeyStyle" />
         <include
-            latin:keyboardLayout="@xml/rowkeys_slavic3" />
+            latin:keyboardLayout="@xml/rowkeys_east_slavic3" />
         <include
             latin:keyboardLayout="@xml/keys_comma_period" />
         <include

java/res/xml-sw600dp/rows_nordic.xml

@@ -27,7 +27,7 @@
         latin:keyWidth="7.9%p"
     >
         <include
-            latin:keyboardLayout="@xml/rowkeys_scandinavian1" />
+            latin:keyboardLayout="@xml/rowkeys_nordic1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-10.0%p"
@@ -37,7 +37,7 @@
         latin:keyWidth="7.9%p"
     >
         <include
-            latin:keyboardLayout="@xml/rowkeys_scandinavian2"
+            latin:keyboardLayout="@xml/rowkeys_nordic2"
             latin:keyXPos="3.5%p" />
         <Key
             latin:keyStyle="enterKeyStyle"

java/res/xml-sw600dp/rows_south_slavic.xml

@@ -27,7 +27,7 @@
         latin:keyWidth="8.0%p"
     >
         <include
-            latin:keyboardLayout="@xml/rowkeys_serbian1" />
+            latin:keyboardLayout="@xml/rowkeys_south_slavic1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-10.0%p"
@@ -37,7 +37,7 @@
         latin:keyWidth="7.9%p"
     >
         <include
-            latin:keyboardLayout="@xml/rowkeys_serbian2"
+            latin:keyboardLayout="@xml/rowkeys_south_slavic2"
             latin:keyXPos="2.15%p" />
         <Key
             latin:keyStyle="enterKeyStyle"
@@ -51,7 +51,7 @@
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="8.0%p" />
         <include
-            latin:keyboardLayout="@xml/rowkeys_serbian3" />
+            latin:keyboardLayout="@xml/rowkeys_south_slavic3" />
         <include
             latin:keyboardLayout="@xml/keys_comma_period" />
         <include

java/res/xml-sw768dp/rows_east_slavic.xml

@@ -30,7 +30,7 @@
             latin:keyStyle="tabKeyStyle"
             latin:keyLabelFlags="alignLeft" />
         <include
-            latin:keyboardLayout="@xml/rowkeys_slavic1" />
+            latin:keyboardLayout="@xml/rowkeys_east_slavic1" />
         <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
         <Key
             latin:keyLabel="&#x044A;" />
@@ -46,7 +46,7 @@
             latin:keyLabelFlags="alignLeft"
             latin:keyWidth="9.375%p" />
         <include
-            latin:keyboardLayout="@xml/rowkeys_slavic2" />
+            latin:keyboardLayout="@xml/rowkeys_east_slavic2" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyXPos="-9.375%p"
@@ -59,7 +59,7 @@
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="12.750%p" />
         <include
-            latin:keyboardLayout="@xml/rowkeys_slavic3" />
+            latin:keyboardLayout="@xml/rowkeys_east_slavic3" />
         <include
             latin:keyboardLayout="@xml/keys_comma_period" />
         <Key

java/res/xml-sw768dp/rows_nordic.xml

@@ -31,7 +31,7 @@
             latin:keyLabelFlags="alignLeft"
             latin:keyWidth="7.500%p" />
         <include
-            latin:keyboardLayout="@xml/rowkeys_scandinavian1" />
+            latin:keyboardLayout="@xml/rowkeys_nordic1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-11.500%p"
@@ -45,7 +45,7 @@
             latin:keyLabelFlags="alignLeft"
             latin:keyWidth="9.375%p" />
         <include
-            latin:keyboardLayout="@xml/rowkeys_scandinavian2" />
+            latin:keyboardLayout="@xml/rowkeys_nordic2" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyXPos="-9.375%p"

java/res/xml-sw768dp/rows_south_slavic.xml

@@ -30,7 +30,7 @@
             latin:keyStyle="tabKeyStyle"
             latin:keyLabelFlags="alignLeft" />
         <include
-            latin:keyboardLayout="@xml/rowkeys_serbian1" />
+            latin:keyboardLayout="@xml/rowkeys_south_slavic1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-9.219%p"
@@ -44,7 +44,7 @@
             latin:keyLabelFlags="alignLeft"
             latin:keyWidth="11.172%p" />
         <include
-            latin:keyboardLayout="@xml/rowkeys_serbian2" />
+            latin:keyboardLayout="@xml/rowkeys_south_slavic2" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyXPos="-15.704%p"
@@ -57,7 +57,7 @@
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="13.829%p" />
         <include
-            latin:keyboardLayout="@xml/rowkeys_serbian3" />
+            latin:keyboardLayout="@xml/rowkeys_south_slavic3" />
         <include
             latin:keyboardLayout="@xml/keys_comma_period" />
     </Row>

java/res/xml-uk/keyboard_set.xml

@@ -23,7 +23,7 @@
     latin:keyboardLocale="uk">
     <Element
         latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_slavic" />
+        latin:elementKeyboard="@xml/kbd_east_slavic" />
     <Element
         latin:elementName="symbols"
         latin:elementKeyboard="@xml/kbd_symbols" />

java/res/xml/kbd_east_slavic.xml

@@ -22,5 +22,5 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <include
-        latin:keyboardLayout="@xml/rows_slavic" />
+        latin:keyboardLayout="@xml/rows_east_slavic" />
 </Keyboard>

java/res/xml/kbd_nordic.xml

@@ -22,5 +22,5 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <include
-        latin:keyboardLayout="@xml/rows_serbian" />
+        latin:keyboardLayout="@xml/rows_nordic" />
 </Keyboard>

java/res/xml/kbd_south_slavic.xml

@@ -22,5 +22,5 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <include
-        latin:keyboardLayout="@xml/rows_scandinavian" />
+        latin:keyboardLayout="@xml/rows_south_slavic" />
 </Keyboard>

java/res/xml/method.xml

@@ -20,9 +20,46 @@
 <!-- The attributes in this XML file provide configuration information -->
 <!-- for the Input Method Manager. -->
 
-<!-- Keyboard: en_US, en_GB, ar, be, bg, cs, da, de, de(QWERTY), el, es, es_US, et, fi, fr, fr_CA,
+<!-- Supported locales: name/layout
-     fr_CH, hr, hu, it, iw, ka, ky, lt, lv, mk, nb, nl, pl, pt, ro, ru, sk, sl, sr, sv, tr, uk,
+    ar: Arabic/arabic
-     vi -->
+    be: Belarusian/east_slavic
+    bg: Bulgarian/bulgarian
+    cs: Czech/qwertz
+    da: Danish/nordic
+    de: German/qwertz
+    de_ZZ: German (QWERTY)/qwerty
+    el: Greek/greek
+    en_US: English United States/qwerty
+    en_GB: English Great Britain/qwerty
+    es: Spanish/spanish
+    et: Estonian/nordic
+    fi: Finnish/nordic
+    fr: French/azerty
+    fr_CA: French Canada/qwerty
+    fr_CH: French Switzerland/qwertz
+    hr: Croatian/qwertz
+    hu: Hungarian/qwertz
+    it: Italian/qwerty
+    iw: Hebrew/hebrew
+    ka: Georgian/georgian
+    ky: Kyrgyz/east_slavic
+    lt: Lithuanian/qwerty
+    lv: Latvian/qwerty
+    mk: Macedonian/south_slavic
+    nb: Norwaian Bokmål/nordic
+    nl: Dutch/qwerty
+    pl: Polish/qwerty
+    pt: Portuguese/qwerty
+    ro: Romanian/qwerty
+    ru: Russian/east_slavic
+    sk: Slovak/qwerty
+    sl: Slovenian/qwerty
+    sr: Serbian/south_slavic
+    sv: Swedish/nordic
+    tr: Turkish/qwerty
+    uk: Ukrainian/east_slavic
+    vi: Vietnamese/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
      subtype.-->

java/res/xml/rows_east_slavic.xml

@@ -27,13 +27,13 @@
         latin:keyWidth="9.091%p"
     >
         <include
-            latin:keyboardLayout="@xml/rowkeys_slavic1" />
+            latin:keyboardLayout="@xml/rowkeys_east_slavic1" />
     </Row>
     <Row
             latin:keyWidth="9.091%p"
     >
         <include
-            latin:keyboardLayout="@xml/rowkeys_slavic2" />
+            latin:keyboardLayout="@xml/rowkeys_east_slavic2" />
     </Row>
     <Row
         latin:keyWidth="8.5%p"
@@ -42,7 +42,7 @@
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="11.75%p" />
         <include
-            latin:keyboardLayout="@xml/rowkeys_slavic3" />
+            latin:keyboardLayout="@xml/rowkeys_east_slavic3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />

java/res/xml/rows_nordic.xml

@@ -27,13 +27,13 @@
         latin:keyWidth="9.091%p"
     >
         <include
-            latin:keyboardLayout="@xml/rowkeys_scandinavian1" />
+            latin:keyboardLayout="@xml/rowkeys_nordic1" />
     </Row>
     <Row
         latin:keyWidth="9.091%p"
     >
         <include
-            latin:keyboardLayout="@xml/rowkeys_scandinavian2" />
+            latin:keyboardLayout="@xml/rowkeys_nordic2" />
     </Row>
     <Row
         latin:keyWidth="10%p"

java/res/xml/rows_south_slavic.xml

@@ -27,13 +27,13 @@
         latin:keyWidth="9.091%p"
     >
         <include
-            latin:keyboardLayout="@xml/rowkeys_serbian1" />
+            latin:keyboardLayout="@xml/rowkeys_south_slavic1" />
     </Row>
     <Row
         latin:keyWidth="9.091%p"
     >
         <include
-            latin:keyboardLayout="@xml/rowkeys_serbian2" />
+            latin:keyboardLayout="@xml/rowkeys_south_slavic2" />
     </Row>
     <Row
         latin:keyWidth="8.5%p"
@@ -42,7 +42,7 @@
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="11.75%p" />
         <include
-            latin:keyboardLayout="@xml/rowkeys_serbian3" />
+            latin:keyboardLayout="@xml/rowkeys_south_slavic3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />

java/src/com/android/inputmethod/keyboard/KeyboardSet.java

@@ -379,6 +379,8 @@ public class KeyboardSet {
         }
     }
 
+    // TODO: Should be removed. This is no longer required if {@link InputMethodSubtype} is
+    // supported.
     public static String parseKeyboardLocale(Resources res, int resId)
             throws XmlPullParserException, IOException {
         final XmlPullParser parser = res.getXml(resId);