diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-11-13 00:41:09 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-11-13 00:41:10 +0000 |
| commit | 63e076764b6f5c5deb0c43b9f8128bee6725edc8 (patch) | |
| tree | d4eb1689e47db82bf66fabc3d9622df7061d8fbc /java/src/com/android/inputmethod/latin | |
| parent | 8b46c595dc54f3f858116428855592bc8b67018a (diff) | |
| parent | 6de31466b04fc2156b99505b5e1dffae7ff476a9 (diff) | |
| download | latinime-63e076764b6f5c5deb0c43b9f8128bee6725edc8.tar.gz latinime-63e076764b6f5c5deb0c43b9f8128bee6725edc8.tar.xz latinime-63e076764b6f5c5deb0c43b9f8128bee6725edc8.zip | |
Merge "Add RichInputMethodSubtype.getKeyboardLayoutSetName"
Diffstat (limited to 'java/src/com/android/inputmethod/latin')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/RichInputMethodSubtype.java | 5 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtils.java | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/RichInputMethodSubtype.java b/java/src/com/android/inputmethod/latin/RichInputMethodSubtype.java index 03f6d60ab..2bcb27483 100644 --- a/java/src/com/android/inputmethod/latin/RichInputMethodSubtype.java +++ b/java/src/com/android/inputmethod/latin/RichInputMethodSubtype.java @@ -142,6 +142,11 @@ public final class RichInputMethodSubtype { @Nonnull public InputMethodSubtype getRawSubtype() { return mSubtype; } + @Nonnull + public String getKeyboardLayoutSetName() { + return SubtypeLocaleUtils.getKeyboardLayoutSetName(mSubtype); + } + // Dummy no language QWERTY subtype. See {@link R.xml.method}. private static final int SUBTYPE_ID_OF_DUMMY_NO_LANGUAGE_SUBTYPE = 0xdde0bfd3; private static final String EXTRA_VALUE_OF_DUMMY_NO_LANGUAGE_SUBTYPE = diff --git a/java/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtils.java b/java/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtils.java index 2724b5424..af9c4bae8 100644 --- a/java/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtils.java +++ b/java/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtils.java @@ -328,10 +328,6 @@ public final class SubtypeLocaleUtils { } @Nonnull - public static String getKeyboardLayoutSetName(@Nonnull final RichInputMethodSubtype subtype) { - return getKeyboardLayoutSetName(subtype.getRawSubtype()); - } - public static String getKeyboardLayoutSetName(final InputMethodSubtype subtype) { String keyboardLayoutSet = subtype.getExtraValueOf(KEYBOARD_LAYOUT_SET); if (keyboardLayoutSet == null) { |