OSDN Git Service

Initialize InputMethodSubtype with "languageTag".
authorYohei Yukawa <yukawa@google.com>
Fri, 22 Jan 2016 06:24:44 +0000 (22:24 -0800)
committerYohei Yukawa <yukawa@google.com>
Fri, 22 Jan 2016 06:24:44 +0000 (22:24 -0800)
My previous commit [1] introduced a new XML attribute "languageTag" for
subtypes but forgot to initialize InputMethodSubtype object with that
attribute.  As a result, InputMethodSubtype#getLanguageTag() has always
returned null even if "languageTag" attribute is specified.

  [1]: I77db5b99a7cf745d800db75baf135bb60ad04820
       8d6eeb01df72891acd3aa75e64aa1595a41cc96e

With this CL, InputMethodSubtype#getLanguageTag() starts returning the
value specified in the XML resource.

Bug: 22859862
Change-Id: I251d3d999afd13c0d618f2cb59e8ed3d47f21c98

core/java/android/view/inputmethod/InputMethodInfo.java

index 4fc6665..43306d0 100644 (file)
@@ -191,6 +191,8 @@ public final class InputMethodInfo implements Parcelable {
                                     .InputMethod_Subtype_label, 0))
                             .setSubtypeIconResId(a.getResourceId(com.android.internal.R.styleable
                                     .InputMethod_Subtype_icon, 0))
+                            .setLanguageTag(a.getString(com.android.internal.R.styleable
+                                    .InputMethod_Subtype_languageTag))
                             .setSubtypeLocale(a.getString(com.android.internal.R.styleable
                                     .InputMethod_Subtype_imeSubtypeLocale))
                             .setSubtypeMode(a.getString(com.android.internal.R.styleable