From 42208100d87769006d0448db604a2efa1048b5d3 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Wed, 25 Jul 2012 12:48:03 +0900
Subject: [PATCH] Use obsolete language code of Indonesian

The java.lang.Locale will transform the official language code "id" to
the obsolete "in".  (new Locale("id")).getLanguageCode() returns
"in". To keep String representation and Locale compatible, we should
use the obsolete "in" as string representation.

This is exactly the same situation of Hebrew ("he" and "iw").

Bug: 6867914
Change-Id: I1a6ea6336d55cbf8a214f025aecf65308fb76140
---
 java/res/xml/method.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index 41d439e95..b1315c002 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -42,10 +42,10 @@
     hi: Hindi/hindi
     hr: Croatian/qwertz
     hu: Hungarian/qwertz
-    id: Indonesian/qwerty
+    in: Indonesian/qwerty    # "id" is official language code of Indonesian.
     is: Icelandic/qwerty
     it: Italian/qwerty
-    iw: Hebrew/hebrew
+    iw: Hebrew/hebrew        # "he" is official language code of Hebrew.
     ka: Georgian/georgian
     ky: Kyrgyz/east_slavic
     lt: Lithuanian/qwerty
@@ -197,9 +197,10 @@
             android:imeSubtypeMode="keyboard"
             android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
     />
+    <!-- Java uses the deprecated "in" code instead of the standard "id" code for Indonesian. -->
     <subtype android:icon="@drawable/ic_subtype_keyboard"
             android:label="@string/subtype_generic"
-            android:imeSubtypeLocale="id"
+            android:imeSubtypeLocale="in"
             android:imeSubtypeMode="keyboard"
             android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable"
     />