summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yohei Yukawa <yukawa@google.com> 2016-01-21 22:24:44 -0800
committer Yohei Yukawa <yukawa@google.com> 2016-01-21 22:24:44 -0800
commitb8456a6a483ce62c81b92f613561fb761be0f3e8 (patch)
tree51fa22ddd3e51cbca00c1943b0ef1c950404a2fd
parent14176272ed387c16c994e9d23dc740fe97cc8017 (diff)
Initialize InputMethodSubtype with "languageTag".
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
-rw-r--r--core/java/android/view/inputmethod/InputMethodInfo.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/view/inputmethod/InputMethodInfo.java b/core/java/android/view/inputmethod/InputMethodInfo.java
index 4fc66656f625..43306d094bda 100644
--- a/core/java/android/view/inputmethod/InputMethodInfo.java
+++ b/core/java/android/view/inputmethod/InputMethodInfo.java
@@ -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