diff options
| author | Ken Wakasa <kwakasa@google.com> | 2014-10-03 23:48:53 +0000 |
|---|---|---|
| committer | Ken Wakasa <kwakasa@google.com> | 2014-10-03 23:48:53 +0000 |
| commit | faefad5b0fd5b188d7eefa66dfaf33c47e181c03 (patch) | |
| tree | 3e2be7dda60aa1863ca851c2944a2cde9b5b2a72 /java/src/com/android/inputmethod/keyboard/KeyboardId.java | |
| parent | 15dbd38283fc9c8fdfd2540f1d94d4dbf2eabcb5 (diff) | |
Revert "[ML14] Forward the locale list to relevant places"
This reverts commit 15dbd38283fc9c8fdfd2540f1d94d4dbf2eabcb5.
Bug: 11230254
Reverting due to unit test breakage.
Change-Id: Icf29ba5c808c754515aef2d1b4162d72f606acfe
Diffstat (limited to 'java/src/com/android/inputmethod/keyboard/KeyboardId.java')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardId.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardId.java b/java/src/com/android/inputmethod/keyboard/KeyboardId.java index ab0d63306..f9cf3535e 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardId.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardId.java @@ -63,6 +63,7 @@ public final class KeyboardId { public static final int ELEMENT_EMOJI_CATEGORY6 = 16; public final RichInputMethodSubtype mSubtype; + public final Locale mLocale; public final int mWidth; public final int mHeight; public final int mMode; @@ -78,6 +79,7 @@ public final class KeyboardId { public KeyboardId(final int elementId, final KeyboardLayoutSet.Params params) { mSubtype = params.mSubtype; + mLocale = SubtypeLocaleUtils.getSubtypeLocale(mSubtype); mWidth = params.mKeyboardWidth; mHeight = params.mKeyboardHeight; mMode = params.mMode; @@ -165,10 +167,6 @@ public final class KeyboardId { return InputTypeUtils.getImeOptionsActionIdFromEditorInfo(mEditorInfo); } - public Locale[] getLocales() { - return mSubtype.getLocales(); - } - @Override public boolean equals(final Object other) { return other instanceof KeyboardId && equals((KeyboardId) other); @@ -183,8 +181,7 @@ public final class KeyboardId { public String toString() { return String.format(Locale.ROOT, "[%s %s:%s %dx%d %s %s%s%s%s%s%s%s%s%s]", elementIdToName(mElementId), - Arrays.deepToString(mSubtype.getLocales()), - mSubtype.getExtraValueOf(KEYBOARD_LAYOUT_SET), + mLocale, mSubtype.getExtraValueOf(KEYBOARD_LAYOUT_SET), mWidth, mHeight, modeName(mMode), actionName(imeAction()), |