From f6997344e6e31ee6e7b95aec6853e0ded00d4083 Mon Sep 17 00:00:00 2001
From: Yohei Yukawa <yukawa@google.com>
Date: Thu, 21 Jan 2016 21:32:46 -0800
Subject: [PATCH] Experimentally specify languageTag attribute.

With previous CLs [1][2], now we can associate a BCP 47 language tag for
each InputMethodSubtype in XML resource file by "languageTag" attribute.
In order to test that the functionality, we start using "languageTag"
for some subtypes.

Note that specifying "languageTag" for all the existing subtypes is
beyond the goal of this CL, which should be handled in subsequent CLs.

Here is the list of subtypes that start having "languageTag" attribute.
  - android:imeSubtypeLocale="en_US" -> android:languageTag="en-US"
  - android:imeSubtypeLocale="en_GB" -> android:languageTag="en-GB"
  - android:imeSubtypeLocale="fr   " -> android:languageTag="fr"
  - android:imeSubtypeLocale="fr_CA" -> android:languageTag="fr-CA"
  - android:imeSubtypeLocale="fr_CH" -> android:languageTag="fr-CH"
  - android:imeSubtypeLocale="tl"    -> android:languageTag="fil"

  [1]: I77db5b99a7cf745d800db75baf135bb60ad04820
       8d6eeb01df72891acd3aa75e64aa1595a41cc96e
  [2]: I251d3d999afd13c0d618f2cb59e8ed3d47f21c98
       b8456a6a483ce62c81b92f613561fb761be0f3e8

Bug: 22858221
Change-Id: I37cb9ce196f2e23589e60ce34475504405778bbb
---
 java/res/xml/method.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index 0b0c93e84..4a0acb24e 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -120,6 +120,7 @@
             android:label="@string/subtype_en_US"
             android:subtypeId="0xc9194f98"
             android:imeSubtypeLocale="en_US"
+            android:languageTag="en-US"
             android:imeSubtypeMode="keyboard"
             android:imeSubtypeExtraValue="TrySuppressingImeSwitcher,AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="true"
@@ -128,6 +129,7 @@
             android:label="@string/subtype_en_GB"
             android:subtypeId="0xb045e755"
             android:imeSubtypeLocale="en_GB"
+            android:languageTag="en-GB"
             android:imeSubtypeMode="keyboard"
             android:imeSubtypeExtraValue="TrySuppressingImeSwitcher,AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="true"
@@ -320,6 +322,7 @@
             android:label="@string/subtype_generic"
             android:subtypeId="0x324da12c"
             android:imeSubtypeLocale="fr"
+            android:languageTag="fr"
             android:imeSubtypeMode="keyboard"
             android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="true"
@@ -328,6 +331,7 @@
             android:label="@string/subtype_generic"
             android:subtypeId="0xeadbb691"
             android:imeSubtypeLocale="fr_CA"
+            android:languageTag="fr-CA"
             android:imeSubtypeMode="keyboard"
             android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="true"
@@ -336,6 +340,7 @@
             android:label="@string/subtype_generic"
             android:subtypeId="0xeadc55f5"
             android:imeSubtypeLocale="fr_CH"
+            android:languageTag="fr-CH"
             android:imeSubtypeMode="keyboard"
             android:imeSubtypeExtraValue="KeyboardLayoutSet=swiss,AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="true"
@@ -735,6 +740,7 @@
             android:label="@string/subtype_generic"
             android:subtypeId="0xf08285ef"
             android:imeSubtypeLocale="tl"
+            android:languageTag="fil"
             android:imeSubtypeMode="keyboard"
             android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable,EmojiCapable"
             android:isAsciiCapable="true"